Commit Graph
45377 Commits
Author SHA1 Message Date
wangzemei 99d8709d93 * fix bug 28217 28220 2022-09-30 10:11:23 +08:00
王怡栋 78049c64ba Merge branch 'master_xieqiyu_26938' into 'master'
* Fix bug#26938.

See merge request easycorp/zentaopms!5637
2022-09-30 01:56:22 +00:00
王怡栋 c580e28d61 Merge branch 'master_xieqiyu_26993' into 'master'
Master xieqiyu 26993

See merge request easycorp/zentaopms!5636
2022-09-30 01:55:56 +00:00
xieqiyu 172550c130 * Fix bug#26938. 2022-09-30 01:50:35 +00:00
李玉春 2f26f526d7 Merge branch 'sprint/cyy_70499' into 'master'
Sprint/cyy 70499

See merge request easycorp/zentaopms!5629
2022-09-30 01:30:06 +00:00
李玉春 a5cd8d997e Merge branch 'sprint/wangzemei/28231' into 'master'
* Fix bug 28231

See merge request easycorp/zentaopms!5632
2022-09-30 01:29:39 +00:00
李玉春 5e719e9a48 Merge branch 'sprint/wangzemei/28234' into 'master'
* fix bug 28234 & 28215

See merge request easycorp/zentaopms!5635
2022-09-30 01:29:10 +00:00
xieqiyu c303642c42 * Code for bug#26993. 2022-09-30 01:28:21 +00:00
wangzemei 6d57c5da04 * Remove blank lines 2022-09-30 09:27:12 +08:00
xieqiyu 9b7dd7f98e * Fix bug#26993. 2022-09-30 01:26:18 +00:00
wangzemei 2bac9d85e0 * add Comments 2022-09-30 09:25:12 +08:00
李玉春 c64e5ac185 Merge branch 'sprint/244_tianshujie_70505' into 'master'
Sprint/244 tianshujie 70505

See merge request easycorp/zentaopms!5634
2022-09-30 01:23:12 +00:00
tianshujie b4530e1a74 * Fix bug #28184. 2022-09-30 09:19:15 +08:00
wangzemei d3ed1bbc4f * add Comments 2022-09-30 09:18:47 +08:00
tianshujie ecdfcffa58 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70505 2022-09-30 09:18:19 +08:00
wangzemei 5c579dc137 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/28234 2022-09-30 09:09:10 +08:00
wangzemei 7c6d631ee8 * fix bug 28215 2022-09-30 09:08:42 +08:00
tianshujie 020cd5ac8a * Finish task #70505. 2022-09-30 09:04:56 +08:00
李玉春 7d24a5ce0d Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug

See merge request easycorp/zentaopms!5633
2022-09-30 00:58:12 +00:00
tianshujie 750e7c41d0 * Fix bug #28161. 2022-09-30 08:48:51 +08:00
王怡栋 8e28c42e0f Merge branch 'bug_28011' into 'master'
* Fix bug#28011

See merge request easycorp/zentaopms!5617
2022-09-30 00:30:17 +00:00
王怡栋 d278c0be48 Merge branch 'master_xieqiyu_27008' into 'master'
* Fix bug#27008.

See merge request easycorp/zentaopms!5628
2022-09-30 00:29:46 +00:00
王怡栋 846ee00dd2 Merge branch 'master_xieqiyu_27048' into 'master'
* Fix bug#27048.

See merge request easycorp/zentaopms!5626
2022-09-30 00:29:21 +00:00
王怡栋 f0be075cfe Merge branch 'master_xieqiyu_27125' into 'master'
* Fix bug#27125.

See merge request easycorp/zentaopms!5624
2022-09-30 00:29:03 +00:00
王怡栋 e9d7dea3e5 Merge branch 'master_xieqiyu_28107' into 'master'
* Fix bug#28107.

See merge request easycorp/zentaopms!5621
2022-09-30 00:28:10 +00:00
tianshujie fc8f8117a3 * Fix bug #28184. 2022-09-29 18:14:13 +08:00
tianshujie cc5e5d3c1d * Fix bug #28192. 2022-09-29 18:06:12 +08:00
wangzemei 69debf9c11 * Fix bug 28231 2022-09-29 17:52:23 +08:00
tianshujie 75b968bcbb * Fix bug #28216. 2022-09-29 17:46:26 +08:00
tianshujie badfc68859 * Fix bug #28165. 2022-09-29 17:42:36 +08:00
wangzemei 4270f963ae * Fix bug #28234 2022-09-29 17:42:34 +08:00
tianshujie 14071af088 * Fix bug #28191. 2022-09-29 17:36:57 +08:00
tianshujie 745647dc6b * Fix bug #28200. 2022-09-29 17:32:04 +08:00
tianshujie 0529e62583 * Fix bug #28162. 2022-09-29 17:26:41 +08:00
tianshujie cd2f27de0f * Finish task #70505. 2022-09-29 17:25:23 +08:00
tianshujie 67d8b3f845 * Finish task #70505. 2022-09-29 17:23:31 +08:00
tianshujie 8a05aaa713 * Finish task #70505. 2022-09-29 17:22:38 +08:00
孙广明 85e5d5c0a8 Merge branch 'sprint/244_tianshujie_70494' into 'master'
Sprint/244 tianshujie 70494

See merge request easycorp/zentaopms!5627
2022-09-29 09:17:37 +00:00
曹延义 f50cad7343 * Adjust code. 2022-09-29 17:14:09 +08:00
tianshujie d2568442eb * Finish task #70494. 2022-09-29 16:54:35 +08:00
李玉春 fc09ce2d86 Merge branch 'sprint/wzm/28207' into 'master'
* Fix bug #28207

See merge request easycorp/zentaopms!5618
2022-09-29 08:49:47 +00:00
xieqiyu bc0aba20b9 * Fix bug#27008. 2022-09-29 08:42:57 +00:00
tianshujie 57df99f43e * Finish task #70494. 2022-09-29 16:34:40 +08:00
xieqiyu 100c4359dd * Fix bug#27048. 2022-09-29 08:34:34 +00:00
xieqiyu 45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
wangzemei 1ef99f0b1d * modify stopPropagation 2022-09-29 16:16:54 +08:00
zenggang 29dbb25855 * Adjust code 2022-09-29 08:13:34 +00:00
xieqiyu e84a192501 * Fix bug#28107. 2022-09-29 08:12:31 +00:00
tianshujie 01c194668b * Finish task #70505. 2022-09-29 15:59:43 +08:00
曹延义 74568631ac * Finish task #70499. 2022-09-29 15:20:30 +08:00