Commit Graph
121 Commits
Author SHA1 Message Date
daitingting 7693217115 * Fix bug #29621. 2022-11-15 05:20:17 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi e6559ea155 * Fix bug #28181. 2022-11-01 14:35:02 +08:00
wangyuting2 4ee6ff742e * Finish task #73062. 2022-10-24 08:09:06 +00:00
Yagami 03fe10a21c * Finish task #72675. 2022-10-20 10:07:48 +08:00
wangyuting2 49901fd7f9 * Finish task #72763 ~ #72772. 2022-10-19 03:03:59 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie 51fb885b08 * Finish task #70482. 2022-09-28 15:10:49 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyidong 64689cbd17 * code for task #69707. 2022-09-20 15:44:33 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
刘刚 46db1983ad Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'
* Finish task #69001.

See merge request easycorp/zentaopms!5329
2022-09-14 09:42:28 +00:00
tanghucheng 710b11ff0c * Finish task #69001. 2022-09-14 17:16:53 +08:00
刘刚 975d5c13cf Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'
* Finish task #69000.

See merge request easycorp/zentaopms!5325
2022-09-14 08:19:55 +00:00
tanghucheng 8045b87d5d * Finish task #69000. 2022-09-14 16:11:51 +08:00
liugang e9ce915eec * Finish task #68998. 2022-09-14 16:01:26 +08:00
liuhong 0c2b54ade7 *Finish task #63787. 2022-08-10 03:57:22 +00:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
tianshujie 6454cc7025 * Resolve issue #697. 2022-07-27 11:15:27 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
tianshujie 68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
tianshujie c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +08:00
tianshujie d225cab26b * Remove spaces. 2022-07-20 09:45:12 +08:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie f0dec448ce * Finish task #61177. 2022-07-20 08:36:04 +08:00
tianshujie 7eed8e4a2b * Finish task #61180. 2022-07-19 13:52:40 +08:00
zhouxudong fa7b1cf743 * Fix bug #24480. 2022-06-30 00:14:12 +00:00
zhouxudong a4fc955da5 * Fix bug #24480. 2022-06-29 09:17:43 +00:00
孙华伟 1251eda902 *Fix bug. 2022-05-12 08:35:59 +08:00
孙华伟 318ccfb4bc Update config.php 2022-05-11 09:03:10 +00:00
孙华伟 f65a51e5e1 *Fix bug. 2022-05-11 17:00:59 +08:00
孙华伟 ce6056ed07 *Optimize the code. 2022-05-11 16:40:48 +08:00
孙华伟 0aa36bd6e5 *Optimize the code. 2022-05-11 16:25:43 +08:00
孙华伟 0695047d20 *Finish task #53659. 2022-05-11 15:40:59 +08:00
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
zhouxin bfa1f3940d Fix bug #19818. 2022-03-14 08:40:16 +00:00
liumengyi d605fd3f2d * Modify project config edition. 2022-02-24 17:20:50 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
xieqiyu 0678ee1fde * Fix bug#19928. 2022-02-24 08:54:08 +08:00
xieqiyu 3186827004 * Modify name. 2022-01-07 08:53:18 +08:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
zhouxin b74b175a9a Do some little change. 2022-01-06 05:01:18 +00:00
李玉春 a19708adeb Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
#   module/project/config.php
2022-01-06 04:01:16 +00:00
zhouxin 0b08489176 Fix bug. 2022-01-06 03:57:50 +00:00
李玉春 0943f58b83 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug.

See merge request easycorp/zentaopms!1282
2022-01-06 03:27:12 +00:00
zhouxin 520f6077bd Add testtask and release table. 2022-01-06 03:25:52 +00:00
zhouxin 05192bdb3e Fix bug. 2022-01-06 03:21:03 +00:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
xieqiyu ed73332c41 * Modify the problems. 2021-12-30 17:17:46 +08:00