Commit Graph

2308 Commits

Author SHA1 Message Date
tianshujie
4b59c7025a * Fix page error problem. 2022-07-21 17:34:07 +08:00
孙广明
49517aec09 * Modify execution-all default param. 2022-07-21 13:13:43 +08: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
王怡栋
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
e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
zhouxudong
1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
王怡栋
08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
tianshujie
5b0ada601f * Reformat code. 2022-07-20 17:05:59 +08:00
tianshujie
bdab39e7f7 * Fixed an issue where advanced tables cannot be selected entirely. 2022-07-20 16:54:43 +08:00
zenggang
5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
王怡栋
d349931e82 Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.

See merge request easycorp/zentaopms!4610
2022-07-20 06:23:40 +00:00
tianshujie
72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie
53e12e967c * Finish task #61181. 2022-07-20 08:48:51 +08:00
tianshujie
e8603eef32 * Finish task #61181. 2022-07-19 15:25:43 +08:00
liumengyi
d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
tianshujie
5a56b7bb21 * Fix bug #25400. 2022-07-18 08:50:45 +08:00
zhouxudong
da0401def9 * Fix bug #24318. 2022-07-15 06:58:16 +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
王怡栋
e399056cee Merge branch 'master_xieqiyu_25365' into 'master'
* Fix bug#25365.

See merge request easycorp/zentaopms!4575
2022-07-15 03:16:28 +00:00
孙广明
aedab5c784 Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.

See merge request easycorp/zentaopms!4571
2022-07-15 03:14:57 +00:00
xieqiyu
311436573a * Fix bug#25365. 2022-07-15 11:12:04 +08:00
孙广明
c04d08210a * Code for php error. 2022-07-15 10:56:52 +08:00
mayue
e31f207b0b * Fix bug #25358. 2022-07-15 10:45:23 +08:00
王怡栋
b022b8b7f5 Merge branch 'master_xieqiyu_25084' into 'master'
* Fix bug#25084.

See merge request easycorp/zentaopms!4567
2022-07-15 02:36:35 +00:00
leiyong
76dc008820 * Processing product default value error. 2022-07-15 02:30:21 +00:00
xieqiyu
f9e7b52cca * Fix bug#25084. 2022-07-15 09:28:00 +08:00
leiyong
949d7e2ce5 * Fix the product default value error. 2022-07-15 01:14:52 +00:00
tianshujie
f9e6fe5de4 * Fix bug #25329. 2022-07-14 17:14:54 +08:00
王怡栋
fc378df8b6 Merge branch 'master_xieqiyu_25027' into 'master'
* Fix bug#25027.

See merge request easycorp/zentaopms!4545
2022-07-14 08:24:13 +00:00
xieqiyu
efe88fea99 * Adjust comment. 2022-07-14 15:28:30 +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
a4a71d2972 * Fix bug #25093. 2022-07-14 15:18:49 +08:00
tianshujie
711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
xieqiyu
a44ba79b1d * Fix bug#25027. 2022-07-14 13:35:17 +08:00
孙广明
083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08:00
tianshujie
b9859380ff * Fix bug #25093. 2022-07-14 13:22:04 +08:00
王怡栋
196ee9ff18 Merge branch 'master_xieqiyu_25094' into 'master'
* Fix bug#25094.

See merge request easycorp/zentaopms!4530
2022-07-14 05:03:50 +00:00
孙广明
327cc16810 * Parent stage don't have link. 2022-07-14 10:53:08 +08:00
zenggang
fd9b0b1053 * Fix bug#25241 2022-07-14 02:20:00 +00:00
xieqiyu
bbab93d08d * Fix bug#25094. 2022-07-14 09:59:06 +08:00
孙广明
6a4d372473 Merge branch 'sprint216_zg_bug' into 'master'
* Fix bug#25222,25232

See merge request easycorp/zentaopms!4527
2022-07-14 01:46:53 +00:00
孙广明
d41303c7e2 Merge branch 'fixbug_dynamic' into 'master'
fixbug_dynamic

See merge request easycorp/zentaopms!4515
2022-07-14 01:44:53 +00:00
孙广明
1444773e4d Merge branch 'sprint/mastr_zhouxudong_code' into 'master'
* Code optimization.

See merge request easycorp/zentaopms!4522
2022-07-14 01:44:40 +00:00
zenggang
38e996bd18 * Fix bug#25222,25232 2022-07-14 01:38:00 +00:00
孙广明
383a864001 * Add disabled to unclikable btn. 2022-07-14 08:39:56 +08:00
zhouxudong
ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
zhouxudong
73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
sunjun
d5c9657af2 fixbug 2022-07-13 06:16:14 +00:00
王怡栋
42629df5ab Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4511
2022-07-13 05:43:07 +00:00
liumengyi
a743cf4b3f * Optimize code. 2022-07-13 13:41:48 +08:00