Commit Graph
28295 Commits
Author SHA1 Message Date
mayue d506cba4a5 *Fix bug #15506. 2021-10-18 17:17:13 +08:00
mayue 1bfd0b0b62 * Fix bug #15506. 2021-10-18 16:55:50 +08:00
王怡栋 8ee2811723 Merge branch '15.6' into sprint/167 2021-10-15 13:11:52 +08:00
李玉春 fae6d95bfe Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
*Finish task #43169

See merge request easycorp/zentaopms!71
2021-10-15 01:32:39 +00:00
李玉春 83f19c2b65 Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167'
* Finish task #43190.

See merge request easycorp/zentaopms!69
2021-10-15 01:31:16 +00:00
tianshujie 4d8095c106 * Finish task #43169. 2021-10-15 09:28:50 +08:00
朱金勇 e50c3c65d9 Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179

See merge request easycorp/zentaopms!49
2021-10-15 01:05:33 +00:00
xieqiyu 8e38b12360 * Code for bug#14879. 2021-10-15 08:06:44 +08:00
tianshujie 943bb6be59 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into 167 2021-10-14 17:16:34 +08:00
zhujinyong 22dab31b5f Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-14 17:10:32 +08:00
zhujinyong b3cfb77e0b + Add api test. 2021-10-14 17:10:11 +08:00
tianshujie f0bd7efdef * Finish task #43190. 2021-10-14 16:42:04 +08:00
tianshujie 1f7e26303a * Adjust css. 2021-10-14 16:38:11 +08:00
王怡栋 03df63c20c Merge branch '15.6' into sprint/167 2021-10-14 16:21:40 +08:00
xieqiyu 140f2f88c8 * Fix bug#15524. 2021-10-14 16:17:01 +08:00
hufangzhou 0541e5a87c * Code for bug #15518. 2021-10-14 16:01:31 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
hufangzhou e6640c6f2c Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 2021-10-14 15:46:54 +08:00
hufangzhou ac5781d88f * Fix bug #15528. 2021-10-14 15:46:50 +08:00
xieqiyu b7da8b63b3 * Code for bug#15513. 2021-10-14 15:32:37 +08:00
王怡栋 5861134df5 Merge branch 'sprint/sgm_fix_bug' into 'sprint/167'
* Fix story review bug.

See merge request easycorp/zentaopms!68
2021-10-14 07:15:48 +00:00
tianshujie 91f8db484c * Fix bug #15511. 2021-10-14 15:09:20 +08:00
孙广明 2b2132d5e0 * Fix story review bug. 2021-10-14 14:56:48 +08:00
xieqiyu 92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
孙广明 5b6e4a771e Merge branch 'sprint/167_zenggang_15466' into 'sprint/167'
* Fix bug#15466

See merge request easycorp/zentaopms!67
2021-10-14 06:37:45 +00:00
hufangzhou 11f7e9cfb7 Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 2021-10-14 14:28:55 +08:00
hufangzhou 3363c1adbf * Code for bug #15518. 2021-10-14 14:28:49 +08:00
zenggang 8e95a7f98d * Fix bug#15466 2021-10-14 06:25:19 +00:00
tianshujie 5c867b2c96 * Fix bug #15525. 2021-10-14 14:11:14 +08:00
孙广明 148b2e5612 Merge branch 'sprint/167_liyuchun_43187' into 'sprint/167'
Finish task #43187.

See merge request easycorp/zentaopms!66
2021-10-14 06:03:12 +00:00
李玉春 d215a06448 Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167'
* Code for task#43168.

See merge request easycorp/zentaopms!65
2021-10-14 05:53:17 +00:00
hufangzhou 07fbc65dfd Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 2021-10-14 13:52:05 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
liyuchun cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
xieqiyu 63248e8f8f * Code for task#43168. 2021-10-14 13:47:13 +08:00
tianshujie ab662e5cf4 * Fix bug #15511. 2021-10-14 13:31:08 +08:00
tianshujie 77f7f7407f * Fix bug #15522. 2021-10-14 13:16:40 +08:00
李玉春 8e1161b02c Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
* Finish task #43169.

See merge request easycorp/zentaopms!64
2021-10-14 05:05:12 +00:00
xieqiyu 601229248d * Code for task#43168. 2021-10-14 12:20:36 +08:00
王怡栋 ad21350632 Merge branch 'sprint/167_sgm_15489' into 'sprint/167'
* Fix bug #15489.

See merge request easycorp/zentaopms!57
2021-10-14 03:32:18 +00:00
tianshujie 993a02eb78 * Fix bug #15521. 2021-10-14 11:31:38 +08:00
tianshujie 264a20d583 * Fix bug #15516. 2021-10-14 10:47:07 +08:00
liyuchun 6e94ad01de Merge branch '15.6' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 2021-10-14 10:06:25 +08:00
xieqiyu b811e3c80d * Fix bug#15513. 2021-10-14 10:05:58 +08:00
liyuchun 01e57a1c57 * Fix bug #15514. 2021-10-14 10:05:53 +08:00
zenggang de37a33ed5 * Adjust code format 2021-10-14 01:56:19 +00:00
tianshujie 04fce5278b * Fix bug #15500. 2021-10-14 09:37:41 +08:00
tianshujie f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +08:00
xieqiyu 02717dbe64 * Fix bug#15512. 2021-10-14 09:20:32 +08:00
孙广明 fb086df41b Merge branch 'sprint/167_zenggang_15490' into 'sprint/167'
* Fix bug#15490

See merge request easycorp/zentaopms!62
2021-10-14 01:03:14 +00:00