Commit Graph

698 Commits

Author SHA1 Message Date
孙广明
88fb3d7cf6 Merge branch 'sprint/271_mayue_bug#30681' into 'master'
* Fix bug #30681.

See merge request easycorp/zentaopms!6510
2022-12-09 06:55:26 +00:00
mayue
c87bc41018 * Restore code. 2022-12-09 14:53:14 +08:00
lanzongjun
980b2998ad * Fix Bug #78688 2022-12-09 13:58:10 +08:00
lanzongjun
8a0cbc6e6d * Finish Bug #30637 2022-12-09 09:41:06 +08:00
mayue
c3c3a29502 * Fix bug #30681. 2022-12-08 17:17:30 +08:00
王怡栋
e259eaea2b Merge branch 'bug_30581' into 'master'
* Fix bug#30581

See merge request easycorp/zentaopms!6487
2022-12-08 00:30:37 +00:00
lanzongjun
7189103e60 * Finish Bug #30558 2022-12-07 15:58:31 +08:00
zenggang
88b7894a3f * Fix bug#30581 2022-12-07 02:44:14 +00:00
lanzongjun
a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
lanzongjun
55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
mayue
796b695b21 * Resolve feedback #1478. 2022-12-06 09:35:42 +08:00
Yagami
55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
lanzongjun
9fc3e25635 * fix execution plans 2022-12-05 09:23:01 +08:00
lanzongjun
a0c214eace * fix bug #30475 2022-12-02 15:54:05 +08:00
lanzongjun
3b09109e21 * fix bug #30496 2022-12-02 15:34:11 +08:00
lanzongjun
546a417339 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 14:41:56 +08:00
lanzongjun
8a81c215b5 * fix bug #30472 2022-12-02 14:41:49 +08:00
Yagami
dda0446e57 * Fix bug #30436. 2022-12-02 14:34:34 +08:00
zenggang
2b66d5d5ca * Fix bug#30470 2022-12-02 05:32:33 +00:00
Yagami
32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
lanzongjun
65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
lanzongjun
ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
lanzongjun
7e0f9114c0 code meeting fix 2022-11-30 09:17:05 +08:00
lanzongjun
9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
胡方舟
13448090a3 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6388
2022-11-25 09:52:30 +00:00
wangyuting
88f5f0dd3b * Fix bug. 2022-11-25 09:47:27 +00:00
王怡栋
c4b3e8d18a * code for bug #devops. 2022-11-25 15:57:52 +08:00
王怡栋
a14dc11193 * fix bug #30271. 2022-11-25 15:55:07 +08:00
Yagami
83a76c2636 * Fix execution list bug. 2022-11-25 14:47:13 +08:00
lanzongjun
3e2648ab5e * Fix Bug #30240 2022-11-25 09:34:57 +08:00
lanzongjun
1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
Yagami
a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
Yagami
ae3bbae974 * Finish task #76491. 2022-11-22 13:21:44 +08:00
王怡栋
26d0d54c22 Merge branch 'zentaopms_263_bug#30000' into 'master'
* Fix bug #30000.

See merge request easycorp/zentaopms!6266
2022-11-21 05:26:23 +00:00
lanzongjun
4dce7205ac * Fix task #76458 2022-11-21 10:36:28 +08:00
wangyuting
f7d7f68fc9 * Fix bug #30000. 2022-11-21 02:18:59 +00:00
王怡栋
d8f5a8bb60 Merge branch 'tianshujie_css' into 'master'
* Modify the execution name width problem in the execution list.

See merge request easycorp/zentaopms!6253
2022-11-18 07:23:13 +00:00
王怡栋
abfdcaa4f5 Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.

See merge request easycorp/zentaopms!6247
2022-11-18 07:19:49 +00:00
lanzongjun
0b2bb1a273 * Fix bug #29442#29695 2022-11-18 15:18:57 +08:00
tianshujie
22b1c539f6 * Modify the execution name width problem in the execution list. 2022-11-18 14:00:34 +08:00
daitingting
8bc0455d36 * Fix bug #29948. 2022-11-18 03:21:58 +00:00
lanzongjun
2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
孙广明
df539f3e38 Merge branch 'master_xieqiyu_75909' into 'master'
* Fix bug#29441.

See merge request easycorp/zentaopms!6135
2022-11-14 06:57:28 +00:00
xieqiyu
5ee8a7e1ac * Fix bug#29441. 2022-11-14 14:46:19 +08:00
lanzongjun
e045ce8322 * finish task #75896 2022-11-14 11:24:50 +08:00
xieqiyu
abe047ee58 * Finish task#75321. 2022-11-09 03:07:57 +00:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie
8d7bcd38f9 * Fix bug #29281. 2022-11-04 11:08:31 +08:00
tianshujie
2000dc8df2 * Fix bug #29278. 2022-11-04 10:31:04 +08:00