Commit Graph

2340 Commits

Author SHA1 Message Date
mayue
12fa7ecaec * Fix cfd issue. 2022-07-28 11:01:24 +08:00
liumengyi
ad763d0fd5 * Optimize code for task #62494. 2022-07-28 10:04:05 +08:00
liumengyi
1375165c73 * Optimize code for task #62494. 2022-07-28 10:02:43 +08:00
liumengyi
e13315a151 * Finish task #62494. 2022-07-28 09:57:02 +08:00
liumengyi
60b32e04da * Fix bug #25797. 2022-07-28 09:54:42 +08:00
王怡栋
e74ddb9e4a Merge branch 'sprint/220_liumengyi_25782' into 'master'
* Fix bug #25782.

See merge request easycorp/zentaopms!4693
2022-07-27 08:59:41 +00:00
王怡栋
378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
liumengyi
845da88b1d * Fix bug #25782. 2022-07-27 16:26:46 +08:00
孙广明
41e968cf34 Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish task #62492, #62493, #62494.

See merge request easycorp/zentaopms!4691
2022-07-27 08:09:36 +00:00
liumengyi
352270909e * Finish task #62492, #62493, #62494. 2022-07-27 16:07:23 +08:00
王怡栋
ad6f2d86fd Merge branch 'sprint/master_zhouxudong_24318' into 'master'
* Fix bug #24318.

See merge request easycorp/zentaopms!4684
2022-07-27 07:22:38 +00:00
zhouxudong
3a251f99b6 * Fix bug #24318. 2022-07-27 07:09:12 +00:00
liumengyi
5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
liumengyi
757a39e21b * Fix issue #696. 2022-07-27 13:06:34 +08:00
liumengyi
0ba22df874 * Fix issue #695. 2022-07-27 13:06:12 +08:00
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
chaideqing
3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +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