Commit Graph

2778 Commits

Author SHA1 Message Date
孙广明
f95c3ee86f Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4638
2022-07-22 05:42:16 +00:00
tianshujie
5818db887f * Fix bug #25122. 2022-07-22 10:28:42 +08:00
王怡栋
71dd54df7a Merge branch 'master_liuhong_24666' into 'master'
Master liuhong 24666

See merge request easycorp/zentaopms!4624
2022-07-22 01:01:47 +00:00
孙广明
59a81e4466 Merge branch 'sprint/217_liumengyi_24337' into 'master'
* Fix bug #24337.

See merge request easycorp/zentaopms!4622
2022-07-21 09:39:30 +00:00
王怡栋
dcd013186a Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4620
2022-07-21 05:08:47 +00:00
liuhong
e858799e11 *Fix bug #24666 2022-07-21 04:23:38 +00:00
liuhong
25a0350108 * Fix bug#24666. 2022-07-21 04:20:57 +00:00
liumengyi
96c59fdf52 * Fix bug #24337. 2022-07-21 10:22:00 +08:00
王怡栋
660f0d0d85 Merge branch 'sprint/master_zhouxudong_61441' into 'master'
Sprint/master zhouxudong 61441

See merge request easycorp/zentaopms!4606
2022-07-21 02:03:20 +00:00
tianshujie
f32443218c * Fix bug #25461. 2022-07-21 09:56:25 +08:00
zhouxudong
9d5f891419 * Finish task #61441. 2022-07-21 01:40:43 +00:00
zhouxudong
1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
liumengyi
72ed2599d1 * Fix bug #25230. 2022-07-21 09:22:20 +08:00
zhouxudong
c637a40725 * Finish task #61441. 2022-07-20 06:56:14 +00:00
zhouxudong
8e46671c20 * Finish task #61441. 2022-07-20 03:07:38 +00:00
zhouxudong
178ea59c4e * Finish task #61441. 2022-07-20 02:30:19 +00:00
zhouxudong
5688575ea9 * Fix bug. 2022-07-18 03:13:48 +00:00
王怡栋
393a7466a1 Merge branch 'master_xieqiyu_25038' into 'master'
* Fix bug#25038.

See merge request easycorp/zentaopms!4580
2022-07-15 07:10:20 +00:00
王怡栋
9fbcd9113c Merge branch 'sprint/215_liumengyi_25386' into 'master'
* Fix bug #25386.

See merge request easycorp/zentaopms!4587
2022-07-15 07:09:55 +00:00
liumengyi
3c974558c1 * Fix bug #25386. 2022-07-15 15:03:01 +08:00
tianshujie
c0c21bc75d * Fix bug #25321. 2022-07-15 14:39:35 +08:00
孙广明
cb01084a13 Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.

See merge request easycorp/zentaopms!4579
2022-07-15 06:17:32 +00:00
孙广明
900e2342a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4582
2022-07-15 06:16:50 +00:00
liumengyi
c38e03a604 * Fix bug #25200. 2022-07-15 14:07:49 +08:00
tianshujie
656cc5f060 * Fix bug #25321. 2022-07-15 14:07:32 +08:00
xieqiyu
12d9c215ee * Fix bug#25038. 2022-07-15 13:58:53 +08:00
liumengyi
7b9c5e6d52 * Fix bug #25230. 2022-07-15 13:42:13 +08:00
孙广明
824c6f5aee Merge branch 'sprint/216_mayue_fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!4577
2022-07-15 05:14:06 +00:00
mayue
a8dc623084 * Fix bug . 2022-07-15 13:13:28 +08:00
zhouxudong
56c1339fbe * Fix bug. 2022-07-15 03:36:57 +00:00
王怡栋
7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
孙广明
c04d08210a * Code for php error. 2022-07-15 10:56:52 +08:00
liumengyi
5fe08a5c14 * Fix bug #25336. 2022-07-15 10:10:45 +08:00
孙广明
4617c3a040 Merge branch 'fixbug_25202' into 'master'
fixbug_25202

See merge request easycorp/zentaopms!4564
2022-07-15 01:22:47 +00:00
sunjun
d375ccf6a3 fixbug_25202 2022-07-15 01:12:58 +00:00
xieqiyu
0c6aa2adb5 * Fix bug#25312. 2022-07-14 15:44:36 +08:00
孙广明
6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
tianshujie
711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
王怡栋
68c747655c Merge branch 'sprint/master_zhouxudong_25262' into 'master'
* Fix bug #25262.

See merge request easycorp/zentaopms!4543
2022-07-14 05:57:38 +00:00
王怡栋
85c209f5e6 Merge branch 'sprint/master_guofeilong_bug#23351' into 'master'
Sprint/master guofeilong bug#23351

See merge request easycorp/zentaopms!4542
2022-07-14 05:55:09 +00:00
guofeilong
dafb0452d3 * Fix bug #23351 2022-07-14 05:50:28 +00:00
zhouxudong
6ffa3a482c * Fix bug #25262. 2022-07-14 05:49:17 +00:00
guofeilong
618d44374a Fix bug #23351 in bug and task batchcreate 2022-07-14 05:37:00 +00:00
孙广明
083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08:00
孙广明
cb6e69a9b9 * Fix execution list drop load bug. 2022-07-14 10:16:04 +08:00
孙广明
1978dbd4b8 Merge branch 'fixbug_25216' into 'master'
Fixbug 25216

See merge request easycorp/zentaopms!4528
2022-07-14 01:46:40 +00:00
sunjun
a40ae1ee63 fixbug_25216 2022-07-14 01:43:36 +00:00
王怡栋
842a44f27c Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476, and fix bug #25063, and fix bug #25230.

See merge request easycorp/zentaopms!4525
2022-07-14 01:36:52 +00:00
liumengyi
b242d1319f * Fix bug #25230. 2022-07-14 09:28:42 +08:00
sunjun
51fe9cc511 fixbug_25216 2022-07-14 01:22:53 +00:00