Commit Graph
41323 Commits
Author SHA1 Message Date
zenggang dbced34eb7 * Adjust code 2022-06-30 09:20:00 +00:00
zenggang 3ccb521c65 * Fix bug#24561 2022-06-30 09:06:44 +00:00
王怡栋 c168920eab Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Iframe and disable will be invalid.

See merge request easycorp/zentaopms!4282
2022-06-30 08:56:39 +00:00
王怡栋 c62fb3f304 Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24609, #24611.

See merge request easycorp/zentaopms!4281
2022-06-30 08:56:01 +00:00
王怡栋 87df303397 Merge branch 'fixbug' into 'master'
* Fix bug #24638.

See merge request easycorp/zentaopms!4283
2022-06-30 08:55:15 +00:00
tanghucheng fd34910cf7 * Fix bug #24638. 2022-06-30 16:53:39 +08:00
liumengyi d65ba3736d * Fix bug #24609. 2022-06-30 16:44:36 +08:00
liumengyi cc8c52ae8d * Fix bug #24611. 2022-06-30 16:44:18 +08:00
王怡栋 70a58529fe Merge branch 'master_xieqiyu_24227' into 'master'
* Fix bug#24227.

See merge request easycorp/zentaopms!4277
2022-06-30 08:35:25 +00:00
zhouxudong 502e3db733 * Iframe and disable will be invalid. 2022-06-30 08:35:22 +00:00
王怡栋 035033a042 Merge branch 'sprint/209_hufangzhou_sqlconfirm' into 'master'
* Add the sql confirm.

See merge request easycorp/zentaopms!4280
2022-06-30 08:34:26 +00:00
xieqiyu f45d133784 * Modify title color. 2022-06-30 16:26:59 +08:00
hufangzhou ca595e9c86 * Add the sql confirm. 2022-06-30 16:24:41 +08:00
xieqiyu 28411d109a * Delete title color. 2022-06-30 16:19:26 +08:00
孙广明 d09fc4e65f Merge branch 'sprint/207_mayue_bug#24639' into 'master'
* Fix bug #24639.

See merge request easycorp/zentaopms!4279
2022-06-30 08:18:23 +00:00
mayue 01fd78720c * Fix bug #24639. 2022-06-30 16:17:47 +08:00
mayue 2e3416c4c8 * Fix bug #24639. 2022-06-30 16:15:10 +08:00
xieqiyu 552421f7db * Fix bug#24227. 2022-06-30 15:49:24 +08:00
王怡栋 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
王怡栋 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
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
王怡栋 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
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
王怡栋 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
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