Commit Graph

618 Commits

Author SHA1 Message Date
李玉春
d7ac642f3d Merge branch 'sprint/170_songchenxuan_43917' into 'sprint/170'
* Finish task 43917

See merge request easycorp/zentaopms!314
2021-11-04 09:42:14 +00:00
root
d6361de047 * Finish task 43917 2021-11-04 17:38:34 +08:00
root
24c8e0948d * Finish task 43917 2021-11-04 17:24:52 +08:00
tianshujie
50ad0453f6 * Modify variable error. 2021-11-04 14:25:33 +08:00
tianshujie
79597546d9 * Finish task #43907. 2021-11-04 09:07:09 +08:00
tianshujie
d297c809b3 * Finish task #43907. 2021-11-03 15:51:04 +08:00
王怡栋
d8ac3d1950 Merge branch 'sprint/167_hufangzhou_package' into 'sprint/167'
* Check the code for upgrade.

See merge request easycorp/zentaopms!84
2021-10-18 05:14:44 +00:00
hufangzhou
c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
王怡栋
621eecf52c * adjust for execution action list. 2021-10-18 10:18:40 +08:00
xieqiyu
92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
tianshujie
ab662e5cf4 * Fix bug #15511. 2021-10-14 13:31:08 +08:00
hufangzhou
a80eca0ab5 * Fix bug #15477. 2021-10-12 15:42:58 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇
ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.

See merge request easycorp/zentaopms!41
2021-10-09 01:32:30 +00:00
王怡栋
a14fc4e7f9 * finish task #42848. 2021-09-30 15:49:24 +08:00
zenggang
f139f00e61 * Task 42862,previously committed to the master branch, now resubmit to the 165 branch 2021-09-30 11:19:05 +08:00
zenggang
5d37062ad6 * Fix bug#15359 2021-09-29 10:46:07 +08:00
朱金勇
8ef308be2f Merge branch 'sprint/165_zenggang' into 'sprint/165'
* Fix bug#15368

See merge request easycorp/zentaopms!35
2021-09-28 08:11:15 +00:00
朱金勇
79a020c0f5 Merge branch 'sprint/165_dingna_task42827' into 'sprint/165'
* Finish task 42827.

See merge request easycorp/zentaopms!36
2021-09-28 07:46:19 +00:00
朱金勇
aa86fdea50 Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!38
2021-09-28 07:37:30 +00:00
liyuchun
9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
dingna
5b5ae6dfdd * Finish task #42827. 2021-09-27 16:21:26 +08:00
zenggang
336a4e5951 * Fix bug#15368 2021-09-27 15:32:22 +08:00
朱金勇
452d4d8605 Merge branch 'sprint/165_zenggang' into 'sprint/165'
Sprint/165 zenggang

See merge request easycorp/zentaopms!27
2021-09-26 09:47:55 +00:00
tianshujie
898d78514e * Finish task #42861. 2021-09-26 17:32:52 +08:00
tianshujie
48fb6fc46f * Finish task #42861. 2021-09-26 17:23:55 +08:00
zenggang
6798a9cb46 * Fix bug#15280 2021-09-26 17:10:11 +08:00
tianshujie
62483636fd * Finish task #42861. 2021-09-26 15:11:50 +08:00
zenggang
c6b7f25fa3 * Adjust code style. 2021-09-18 14:08:31 +08:00
zenggang
4380f4d4b0 * Fix bug#14580 2021-09-18 11:01:08 +08:00
王怡栋
5f8067802d Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 17:01:59 +08:00
tianshujie
caaaa90cf5 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 15:56:33 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
zenggang
da6ed899ac * Fix bug 14926 2021-09-15 15:09:39 +08:00
王怡栋
77d501887d * fix bug for save execution session. 2021-09-15 14:34:13 +08:00
dingna
ededa035c9 * Fix bug #14199. 2021-09-15 11:23:36 +08:00
xieqiyu
47da26c5c8 * Fix bug#15149. 2021-09-14 15:39:36 +08:00
zenggang
75a44c6a05 * Fix bug#14926 2021-09-14 14:26:54 +08:00
xieqiyu
4a41a2888e * Fix bug#15149. 2021-09-14 14:22:24 +08:00
王怡栋
f60c06fd5c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 11:36:22 +08:00
王怡栋
b70381885a * add new version and upgrade. 2021-09-14 11:36:00 +08:00
liyuchun
96fd75142f * Code for task #41764. 2021-09-14 11:20:00 +08:00
xieqiyu
7fffa6c380 * Code for bug#15148. 2021-09-14 10:33:48 +08:00
tianshujie
c473a76d01 * Fix bug #15136. 2021-09-14 08:56:22 +08:00
dingna
a4d66018e6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 17:02:21 +08:00
dingna
df3d33e91f * Fix bug #14930. 2021-09-13 16:56:52 +08:00
hufangzhou
94854c4dec * Adjust the width of execution story actions. 2021-09-13 16:03:34 +08:00
tianshujie
8219bc43d3 * Fix bug #14966. 2021-09-13 09:52:24 +08:00
王怡栋
2fadc69fa3 * fix bug #15083,15079. 2021-09-10 11:34:10 +08:00