Commit Graph

790 Commits

Author SHA1 Message Date
zhujinyong
b2b07abd7e * Fix bug #32411. 2023-03-01 12:00:44 +08:00
tianshujie
d2a75a9cdf * Code for fix bug #32508. 2023-02-28 17:08:19 +08:00
tianshujie
4e7f8247e3 * Code for finish task #84593. 2023-02-18 15:16:29 +08:00
tianshujie
484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
Yagami
877435e6e6 * Code for error. 2023-02-08 11:01:09 +08:00
Yagami
3673d7f4b0 * Code for task #83947. 2023-02-08 10:24:01 +08:00
Yagami
243316723f * Remove unused code. 2023-02-08 08:33:58 +08:00
Yagami
4403b96bf8 * Finish task #83947. 2023-02-07 16:05:18 +08:00
zhouxin
d207715804 * Resolve feedback #2015. 2023-01-31 09:02:38 +08:00
xieqiyu
62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
daitingting
2003a9bf99 * Finish task #82067. 2023-01-08 02:31:02 +00:00
caoyanyi
f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
mayue
c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
caoyanyi
1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi
90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
tianshujie
280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00
tianshujie
91f6d1b9f0 * Fix bug #29293. 2022-11-07 09:54:41 +08:00
tianshujie
2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
liumengyi
0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
liuhong
1b7c9a9897 * Fix bug #29290. 2022-11-04 07:32:00 +00:00
mayue
4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +08:00
王怡栋
707df59e48 Merge branch 'master_bug_26228' into 'master'
* Adjust code for bug #26228.

See merge request easycorp/zentaopms!5961
2022-11-01 05:33:20 +00:00
liuhong
fe056715f5 * Adjust code for bug #26228. 2022-10-31 10:03:23 +00:00
Lufei
031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
liuhong
0e81c1cf78 * Fix bug #26228. 2022-10-30 04:39:47 +00:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie
354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
liyuchun
11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
wangyidong
ef7072c10a * fix bug #28870. 2022-10-24 14:11:29 +08:00
liyuchun
00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
liuhong
482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +00:00
曹延义
6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义
fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +08:00
wangyuting2
d71b81c9cb * Finish task #72774. 2022-10-19 06:07:55 +00:00
tianshujie
8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
liuhong
0e77b9f5e9 *Fix bug #28532. 2022-10-17 01:10:49 +00:00
王怡栋
0b569126ea Merge branch 'master_26245' into 'master'
* The execution logic to which the update task belongs when it is newly created.

See merge request easycorp/zentaopms!5680
2022-10-10 03:13:59 +00:00
liuhong
7571484ba7 *Adjust code for bug #26245. 2022-10-10 03:11:30 +00:00
liuhong
1d1ae03b95 * The execution logic to which the update task belongs when it is newly created. 2022-10-09 03:20:04 +00:00
曹延义
0afdc68654 Merge branch 'master' into zenops_46 2022-09-30 15:07:37 +08:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
liyuchun
6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
曹延义
feb98f882c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug 2022-09-29 09:16:40 +08:00
曹延义
480f5db2d0 * Modify multi task estimate order. 2022-09-29 09:08:19 +08:00
曹延义
5a652d9ef6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 15:57:00 +08:00
liuhong
a7980a4852 *Update code logic. 2022-09-27 02:15:22 +00:00
曹延义
0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00