Commit Graph
687 Commits
Author SHA1 Message Date
王怡栋 735bc3dc09 Merge branch 'fixbug' into 'master'
* Fix bug #24177.

See merge request easycorp/zentaopms!4092
2022-06-23 01:42:57 +00:00
tanghucheng 4d8da5eeb1 * Fix bug #24177. 2022-06-23 09:40:19 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
tanghucheng 98d4d45079 * Add menuorder for custom setting. 2022-06-21 10:10:25 +08:00
zenggang ea2280da59 * Adjust code 2022-06-14 06:56:01 +00:00
zenggang cc49cbe439 * Finish task#57156 2022-06-14 06:03:55 +00:00
mayue 0beaa60d98 * Optimize code. 2022-06-09 09:55:19 +08:00
mayue 4c0d6836b6 * Fix bug. 2022-06-09 09:28:00 +08:00
mayue 1e69f979cd * Optimize code. 2022-06-08 14:42:03 +08:00
mayue d64e16d4ef * Finish story#9206. 2022-06-08 13:48:36 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi 356d69025a * Fix bug #23236. 2022-06-02 17:08:00 +08:00
liumengyi d93d30e2d7 * Optimize code for task #55677. 2022-06-01 14:39:11 +08:00
liumengyi 07bebde892 * Fix bug for #task #55677. 2022-06-01 14:28:51 +08:00
liumengyi 499024e935 * Finish tash #55677. 2022-06-01 10:36:46 +08:00
孙广明 e864362836 * Fix bug #22944. 2022-05-26 10:48:34 +08:00
孙广明 79ebf4a441 * Fix bug #22944. 2022-05-26 09:42:12 +08:00
孙广明 ececdba8df * Fix bug #55323. 2022-05-25 14:46:59 +08:00
sunjun ca20a35a26 sprint_sunjun_55259 2022-05-25 01:34:10 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyidong 8d808c560f * fix bug. 2022-05-20 12:00:52 +08:00
wangyidong a8531b8e58 * fix bug. 2022-05-20 10:40:45 +08:00
tianshujie 244a281a47 * Finish task #54329. 2022-05-19 09:57:00 +08:00
tianshujie db940f77fd * Finish task #54329. 2022-05-19 09:43:34 +08:00
tianshujie d79a01aecb * Finish task #54329. 2022-05-19 08:40:01 +08:00
tianshujie f1f4c511b5 * Finish task #54329. 2022-05-18 16:08:09 +08:00
李玉春 1f768098c6 Merge branch 'sprint/191_liumengyi_54354' into 'master'
Sprint/191 liumengyi 54354

See merge request easycorp/zentaopms!3461
2022-05-17 09:28:22 +00:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
liumengyi 40f4e808da * Finish task #54354. 2022-05-17 15:43:15 +08:00
liumengyi 71cb47e7eb * Finish task #54349. 2022-05-17 14:51:13 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
孙广明 ec014a85f0 Merge branch 'sprint/189_zhouxudong_53670' into 'master'
* Finish task #53670.

See merge request easycorp/zentaopms!3314
2022-05-10 09:24:53 +00:00
tanghucheng 528fa45357 * Fix bug. 2022-05-10 05:13:35 +00:00
zhouxudong 4bb2ff1862 * Finish task #53670. 2022-05-10 01:34:01 +00:00
xieqiyu 0946351076 * Fix bug#22144. 2022-05-05 11:17:45 +08:00
xieqiyu 535257a9a7 * Fix bug#14383. 2022-04-28 10:59:54 +08:00
zenggang 7c159eeb96 * Fix bug #21823,7042 2022-04-20 06:58:50 +00:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
zenggang c67d09a090 * Fix bug#20900 2022-04-07 09:30:51 +00:00
liyuchun 3804046bdb * Fix bug #21182. 2022-04-07 09:15:35 +08:00
孙广明 1dac727a25 Merge branch 'fixbug' into 'master'
* Code for bug #21058.

See merge request easycorp/zentaopms!2593
2022-03-29 06:01:38 +00:00
tanghucheng 12c3fd80dd * Code for bug #21058. 2022-03-28 17:01:56 +08:00
tianshujie db388f5d74 * Fix bug #17359. 2022-03-28 09:42:50 +08:00
liyuchun 262e38d0c8 * Fix bug #17252. 2022-03-25 11:21:03 +08:00
liyuchun df358d29ef * Fix bug #50954. 2022-03-21 13:14:44 +08:00
孙广明 140c7652ad * Fix upgrade bug. 2022-03-14 14:23:19 +08:00
tianshujie a7d66c5fae * Fix bug #20572. 2022-03-10 10:05:34 +08:00