Commit Graph

2903 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
孙广明
8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
lanzongjun
980b2998ad * Fix Bug #78688 2022-12-09 13:58:10 +08:00
wangzemei
0b6503dfcf * Fix chosen class about execution 2022-12-09 13:48:26 +08:00
lanzongjun
d07a8a3e37 * Fix Bug #78695 2022-12-09 13:44:48 +08:00
wangyidong
f1b27ca35a * fix bug #30745. 2022-12-09 12:23:09 +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
xieqiyu
44c075b0ae * Fix bug#30613. 2022-12-08 09:50: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
孙广明
688866a30e Merge branch 'master_xieqiyu_78668' into 'master'
* Finish task#78668.

See merge request easycorp/zentaopms!6488
2022-12-07 05:01:49 +00:00
xieqiyu
a2d2c55e94 * Code for task#78668. Add trim. 2022-12-07 11:25:41 +08:00
xieqiyu
afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
zenggang
88b7894a3f * Fix bug#30581 2022-12-07 02:44:14 +00:00
wangyidong
595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
lanzongjun
cb6f17a43e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 09:13:19 +08:00
Yagami
e5b21b632e * Change execution link stories lang. 2022-12-07 09:10:37 +08:00
lanzongjun
a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
hufangzhou
871eb1c0a3 * Fix bug #30500. 2022-12-06 09:20:32 +00: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
lanzongjun
7bef1eaf28 * Finish Task #78670 2022-12-05 11:22:24 +08:00
Yagami
55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
wangyidong
fdc4c4159f * adjust for icon. 2022-12-05 10:29:48 +08:00
wangyidong
33d2c170fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-05 10:11:28 +08:00
wangyidong
42e85ebbb8 * code for task #78384. 2022-12-05 10:10:59 +08:00
lanzongjun
ea0d3d44ba Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-05 09:23:07 +08:00
lanzongjun
9fc3e25635 * fix execution plans 2022-12-05 09:23:01 +08:00
Yagami
3c088eb548 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 15:59:02 +08:00
Yagami
d7d897a8f7 * Fix code error. 2022-12-02 15:58:52 +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
a1bd34b3ce * fix bug #30496 2022-12-02 15:32:36 +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
Yagami
dbc00993c6 * Fix execution manage products bug. 2022-12-02 13:42:09 +08:00
zenggang
2b66d5d5ca * Fix bug#30470 2022-12-02 05:32:33 +00:00
Yagami
8cb3e136d3 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 10:48:11 +08:00
Yagami
32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
王怡栋
7013e19604 Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
2022-12-01 07:54:50 +00:00
liumengyi
a6c8171286 * Fix bug #30278. 2022-12-01 10:33:59 +08:00
chaideqing
756a9dc5a5 * Add vi lang. 2022-12-01 10:25:28 +08:00
chaideqing
6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
lanzongjun
65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
chaideqing
bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
wangyidong
b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00