Commit Graph
41478 Commits
Author SHA1 Message Date
王怡栋 c216e570a9 Merge branch 'sprint/master_guofeilong_24581' into 'master'
* fix bug #24581 in ZUI

See merge request easycorp/zentaopms!4276
2022-06-30 07:43:37 +00:00
王怡栋 04ca0ff10c Merge branch '35_fixbug' into 'sprint/zentaomax35'
* Fix bug #23353.

See merge request easycorp/zentaopms!4275
2022-06-30 07:43:22 +00:00
王怡栋 93e62bbc7d Merge branch 'sprint/master_zhouxudong_23741' into 'master'
* Fix bug #23741.

See merge request easycorp/zentaopms!4274
2022-06-30 07:42:51 +00:00
tanghucheng 69539dbac4 * Fix bug #23353. 2022-06-30 15:40:48 +08:00
guofeilong 23a07709fd * fix bug #24581 in ZUI 2022-06-30 07:36:50 +00:00
王怡栋 8affb6ded3 Merge branch 'sprint/209_hufangzhou_24623' into 'master'
* Fix bug #24623.

See merge request easycorp/zentaopms!4269
2022-06-30 07:35:41 +00:00
zhouxudong e87d50a738 * Fix bug #23741. 2022-06-30 07:35:12 +00:00
hufangzhou 99b2694d90 * Add the comment. 2022-06-30 15:34:02 +08:00
王怡栋 24078a47db Merge branch 'sprint/master_lanzongjun_fixbug' into 'sprint/zentaomax35'
* fix bug #23729

See merge request easycorp/zentaopms!4272
2022-06-30 07:21:19 +00:00
王怡栋 4126074ba5 Merge branch 'sprint/209_hufangzhou_24626' into 'master'
* Fix bug #24626.

See merge request easycorp/zentaopms!4273
2022-06-30 07:20:45 +00:00
lanzongjun 76b79da0c1 * fix bug #23996 2022-06-30 15:20:38 +08:00
hufangzhou 4336b35a36 * Fix bug #24626. 2022-06-30 15:13:34 +08:00
孙广明 05e02b7325 Merge branch 'sprint/207_mayue_bug#24602' into 'master'
* Fix bug #24602.

See merge request easycorp/zentaopms!4267
2022-06-30 07:11:05 +00:00
孙广明 c4d5027b86 Merge branch 'fixbug_lang' into 'master'
Fixbug lang

See merge request easycorp/zentaopms!4271
2022-06-30 07:10:37 +00:00
lanzongjun adbefcd261 Merge branch 'sprint/zentaomax35' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-30 15:08:09 +08:00
lanzongjun f73072e6de * fix bug #23729 2022-06-30 15:07:31 +08:00
王怡栋 d8094cba31 Merge branch 'sprint/workflow' into 'master'
* Add openedApproval config.

See merge request easycorp/zentaopms!4268
2022-06-30 07:06:32 +00:00
王怡栋 2beaab1344 Merge branch 'master_xieqiyu_24216' into 'master'
* Fix bug#24216.

See merge request easycorp/zentaopms!4266
2022-06-30 07:06:00 +00:00
王怡栋 7fa7d64b99 Merge branch 'fixbug' into 'master'
* Fix bug #24102.

See merge request easycorp/zentaopms!4265
2022-06-30 07:03:42 +00:00
王怡栋 8f3bd4ff29 Merge branch 'sprint/208_tianshujie_24579' into 'master'
* Fix bug #24579.

See merge request easycorp/zentaopms!4270
2022-06-30 07:03:03 +00:00
sunjun 6f72eb53ce fixbug_lang 2022-06-30 06:51:28 +00:00
hufangzhou 49b54944ad * Fix bug #24623. 2022-06-30 14:47:31 +08:00
sunjun eb1d78fd11 fixbug_lang 2022-06-30 06:45:58 +00:00
wangyuting2 20ef9ee98e * Add openedApproval config. 2022-06-30 14:38:45 +08:00
tianshujie c971b72c48 * Fix bug #24579. 2022-06-30 14:19:48 +08:00
tanghucheng 9d0322a1b8 * Fix bug #24102. 2022-06-30 14:15:13 +08:00
xieqiyu 1b338f5cf5 * Fix bug#24216. 2022-06-30 14:09:52 +08:00
王怡栋 90544b50e7 Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #23914, #23999, #24599.

See merge request easycorp/zentaopms!4264
2022-06-30 06:08:11 +00:00
王怡栋 4ab26414cb Merge branch 'sprint/master_zhouxudong_24472' into 'master'
Sprint/master zhouxudong 24472

See merge request easycorp/zentaopms!4263
2022-06-30 06:07:01 +00:00
王怡栋 6d51ae6946 Merge branch 'sprint/master_zhoxudong_24598' into 'master'
* Fix bug #24598.

See merge request easycorp/zentaopms!4262
2022-06-30 06:06:11 +00:00
liumengyi 61a1405ff2 * Fix bug #23914, #23999. 2022-06-30 14:03:24 +08:00
wangyidong 18a15b1d9d * fix bug #23590. 2022-06-30 14:02:48 +08:00
liumengyi 076a744a0a * Fix bug #23914, #23999. 2022-06-30 13:58:18 +08:00
zhouxudong bd848e13e2 * Fix bug #24598. 2022-06-30 05:51:38 +00:00
mayue d012898134 * Fix bug #24602. 2022-06-30 13:44:37 +08:00
王怡栋 ce908479e7 Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
* Fixed TAB return error.

See merge request easycorp/zentaopms!4261
2022-06-30 05:43:43 +00:00
liumengyi 59acd48cd3 * Fix bug #24599. 2022-06-30 13:42:52 +08:00
tianshujie 98b100b6d1 * Add comments. 2022-06-30 13:40:43 +08:00
tianshujie 5a7778acbe * Fixed TAB return error. 2022-06-30 13:37:34 +08:00
朱金勇 cb21396b98 Merge branch 'sprint/sunhao/optimize_apps_loading' into 'master'
* optimize apps loading state.

See merge request easycorp/zentaopms!4256
2022-06-30 05:29:12 +00:00
王怡栋 c16fc0d3a5 Merge branch 'sprint/209_hufangzhou_23942' into 'master'
* Fix bug #23942.

See merge request easycorp/zentaopms!4260
2022-06-30 05:28:58 +00:00
zhouxudong 0f18bca723 * Fix bug #24472. 2022-06-30 05:27:00 +00:00
hufangzhou 2fe046f186 * Fix bug #23942. 2022-06-30 13:25:33 +08:00
zhouxudong e4637e9ab3 * Fix bug #24472. 2022-06-30 05:25:31 +00:00
王怡栋 7e7147567c Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24288.

See merge request easycorp/zentaopms!4258
2022-06-30 05:18:33 +00:00
李玉春 ae0722b146 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23945.

See merge request easycorp/zentaopms!4247
2022-06-30 05:18:15 +00:00
王怡栋 531a112d7d Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4259
2022-06-30 05:17:58 +00:00
tianshujie 7528cdfdcf * Fix bug #24554. 2022-06-30 13:16:31 +08:00
liumengyi 6e107a4783 * Fix bug #24288. 2022-06-30 13:15:03 +08:00
王怡栋 baa7851b95 Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #23250.

See merge request easycorp/zentaopms!4257
2022-06-30 05:10:56 +00:00