Commit Graph
2324 Commits
Author SHA1 Message Date
zhouxudong 38ae663640 * Fix bug #25703. 2022-07-27 01:52:04 +00:00
tianshujie a84a4098e9 * Fix bug #25721. 2022-07-26 17:18:35 +08:00
tianshujie a2f203990e * Fixed burnout chart display in execution list. 2022-07-26 17:05:13 +08:00
王怡栋 f4b971d877 Merge branch 'sprint/220_liumengyi_25699' into 'master'
* Fix bug #25699, #25700.

See merge request easycorp/zentaopms!4661
2022-07-26 08:16:38 +00:00
liumengyi 1284608659 * Fix bug #25700. 2022-07-26 16:06:57 +08:00
liumengyi 30b7ecbee7 * Fix bug #24009. 2022-07-26 16:02:47 +08:00
王怡栋 649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
zhouxudong b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
孙广明 867f5467d9 * Fix bug #25678. 2022-07-26 13:20:41 +08:00
liumengyi a0a9d5e765 * Optimize for task #61971. 2022-07-26 12:02:28 +08:00
liumengyi e3d090d917 * Fix bug for task #61975. 2022-07-26 11:18:34 +08:00
liumengyi b67950c1ba * Fix bug for task #61973. 2022-07-26 10:27:08 +08:00
liumengyi 865986c216 * Finish task #61973. 2022-07-26 09:36:30 +08:00
liumengyi 13991e6250 * Optimize code. 2022-07-25 13:44:04 +08:00
liumengyi c12d5d1da6 * Finish task #61975. 2022-07-25 13:38:49 +08:00
liumengyi ba16cfa637 * Fix bug #61971. 2022-07-25 13:15:28 +08:00
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