Commit Graph

822 Commits

Author SHA1 Message Date
liumengyi
aa7540d163 * Fix bug #32558. 2023-03-01 08:47:10 +00:00
liumengyi
9567ecadfb * Fix bug of check date. 2023-03-01 08:11:25 +00:00
孙广明
65884c2dd9 Merge branch 'fixbug_liumengyi_32423' into 'master'
* Fix bug  32423 32540 32157.

See merge request easycorp/zentaopms!7110
2023-03-01 07:49:18 +00:00
Yagami
9fe8ffa4af Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-01 14:48:22 +08:00
Yagami
97c421c5b4 * Fix bug #32374. 2023-03-01 14:48:12 +08:00
liumengyi
2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
孙广明
cef80a4330 Merge branch 'sprint/hufangzhou_fixbug_32533' into 'master'
* Fix bug #32533.

See merge request easycorp/zentaopms!7107
2023-03-01 06:34:02 +00:00
孙广明
dc4027286e Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32513.

See merge request easycorp/zentaopms!7106
2023-03-01 06:33:24 +00:00
hufangzhou
c262a060bd * Fix bug #32533. 2023-03-01 05:32:58 +00:00
liumengyi
951e4a09e1 * Fix bug #32513. 2023-03-01 05:06:42 +00:00
hufangzhou
e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +00:00
zhujinyong
e0bb071d99 * Fix bug #32339. 2023-03-01 08:52:19 +08:00
王怡栋
4f6e7cbe34 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7096
2023-03-01 00:32:32 +00:00
王怡栋
97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00
tianshujie
797c0befa2 * Code for fix bug #32505. 2023-02-28 17:03:09 +08:00
Yagami
7ca8fbffb4 * Fix code error. 2023-02-28 16:22:59 +08:00
孙广明
54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
xieqiyu
23518e36fd * Code for bug#32489. 2023-02-28 14:33:43 +08:00
Yagami
abc8bf2788 * Fix bug #32450. 2023-02-28 14:16:29 +08:00
liumengyi
cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
liumengyi
0f7851c03a * Fix bug #32464. 2023-02-28 02:59:43 +00:00
liumengyi
415c19a5d4 * Optimize code. 2023-02-28 01:47:28 +00:00
liumengyi
1d0e0aa68c * Fix bug #32445. 2023-02-27 08:38:16 +00:00
hufangzhou
340ae715e6 * Add execution module unit testcase. 2023-02-24 08:27:55 +00:00
孙广明
2fdd4f704a Merge branch 'sprint/lmy_task' into 'master'
* Finish task #85455, #85456.

See merge request easycorp/zentaopms!7066
2023-02-24 07:20:22 +00:00
Yagami
b151d1fb32 * Finish task #85459. 2023-02-24 14:50:37 +08:00
liumengyi
f45c4ccdd4 * Finish task #85455, #85456. 2023-02-24 06:24:16 +00:00
tianshujie
70f07dde4a * Remove other navigation for iterations under the Fusion Falls project. 2023-02-24 11:32:51 +08:00
孙广明
fccd283453 Merge branch 'sprint/292_liumengyi_32202' into 'master'
* Fix bug #32202,#32281, and finish task #42089.

See merge request easycorp/zentaopms!7051
2023-02-24 03:22:19 +00:00
孙广明
986e4d1e36 Merge branch 'sprint/292_liumengyi_85434' into 'master'
* Finish task #85434.

See merge request easycorp/zentaopms!7052
2023-02-24 03:22:13 +00:00
孙广明
e624b8c1e2 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Add sql for process, and modify method to management method, fix bug #32421,#32424.

See merge request easycorp/zentaopms!7061
2023-02-24 03:21:47 +00:00
liumengyi
ae5ad1bba8 * Fix bug #32421. 2023-02-24 02:31:15 +00:00
zhujinyong
d0ab2da0d1 * Fix bug #32403. 2023-02-24 10:25:57 +08:00
王怡栋
9e73c11871 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #27133.

See merge request easycorp/zentaopms!7060
2023-02-24 00:52:49 +00:00
wangyuting2
7de68720de * Fix bug #27133. 2023-02-24 08:47:54 +08:00
liumengyi
d52c3bd4d3 * Fix bug #32281. 2023-02-23 07:30:39 +00:00
liumengyi
9283507b20 * Finish task #85434. 2023-02-23 02:11:30 +00:00
hufangzhou
166e496346 * Fix the issue 'Refactor this file to either declare symbols or cause side effects, but not both.'. 2023-02-23 01:13:42 +00:00
hufangzhou
c2a9a39b10 * Remove the uninitialized value. 2023-02-23 01:01:22 +00:00
hufangzhou
cd44e32af6 * Resolve issue #755. 2023-02-23 00:19:44 +00:00
wangxuepeng
d20c27d18d * Fix bug #32375. 2023-02-22 08:24:23 +00:00
wangxuepeng
f710936784 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into wxp_bug32375 2023-02-22 08:20:10 +00:00
wangxuepeng
16109dc94b * Fix bug #32375. 2023-02-22 08:17:21 +00:00
孙广明
25fa088422 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7033
2023-02-22 07:55:34 +00:00
liumengyi
5ed6406041 * Fix issue #754, #751, and adjust width of create project guide. 2023-02-22 07:50:21 +00:00
tianshujie
2668c3040e * Refactor. 2023-02-22 15:36:15 +08:00
tianshujie
af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
hufangzhou
02b8e6f723 * Finish task #85037. 2023-02-21 08:46:43 +00:00
Yagami
b2955aa657 * Code for task #85045. 2023-02-20 15:11:00 +08:00
hufangzhou
1849f501fb * Sort the IDs, the child stage comes first, and the parent stage follows. 2023-02-20 02:11:04 +00:00