Commit Graph
37871 Commits
Author SHA1 Message Date
caoyanyi fa3411ce92 * Fix bug #15292. 2022-04-21 01:04:50 +00:00
王怡栋 884c145ce2 Merge branch 'fixbug' into 'master'
* Fix bug #21846.

See merge request easycorp/zentaopms!3019
2022-04-21 00:44:21 +00:00
Hao Sun f0c120373f * fix picker control not initialized in search form. 2022-04-20 20:39:04 +08:00
王怡栋 21c0fbb067 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 17:19:32 +08:00
王怡栋 54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
孙广明 48c8950520 Merge branch 'sprint/scx_taskapi' into 'master'
* Fix bug #21677.

See merge request easycorp/zentaopms!3038
2022-04-20 09:18:38 +00:00
songchenxuan efcc54d604 * Fix bug #21677. 2022-04-20 17:15:53 +08:00
孙广明 d68229bc53 Merge branch 'mayue_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3037
2022-04-20 09:04:19 +00:00
mayue 05639579e0 * Fix bug. 2022-04-20 17:02:32 +08:00
sunjun d2325e9b93 *Fixbug_sunjun_21811 2022-04-20 16:05:26 +08:00
朱金勇 17dbbe5401 Merge branch 'fixbug_wangxiaomeng_#21773_#21650' into 'master'
Fixbug wangxiaomeng #21773 ,21650.

See merge request easycorp/zentaopms!2990
2022-04-20 07:56:24 +00:00
李玉春 243dca8934 Merge branch 'bug_21823' into 'master'
Fix bug #21823,7042

See merge request easycorp/zentaopms!3032
2022-04-20 07:55:40 +00:00
wangxiaomeng b635d1bf59 fixbug_21650 edit getByID. 2022-04-20 15:55:24 +08:00
李玉春 8d5631a4b1 Merge branch 'cyy_bug' into 'master'
* Add sudo param.

See merge request easycorp/zentaopms!3031
2022-04-20 07:53:09 +00:00
朱金勇 7c398a3840 Merge branch 'fixbug_wangxiaomeng#21834' into 'master'
fixbug_#21834.

See merge request easycorp/zentaopms!3036
2022-04-20 07:50:49 +00:00
李玉春 6aed6d4317 Merge branch 'sunhuawei_fixbug_15207' into 'master'
* Fix bug #15207.

See merge request easycorp/zentaopms!3035
2022-04-20 07:49:29 +00:00
朱金勇 abc12cd9ad Merge branch 'sprint/sunhao/bug21867' into 'master'
* bug #21867, fix sub menu position in dropdown.

See merge request easycorp/zentaopms!3033
2022-04-20 07:47:31 +00:00
朱金勇 7df8158405 Merge branch 'sprint/sunhao/fix_avatar_display' into 'master'
* fix issue on show avatar.

See merge request easycorp/zentaopms!3025
2022-04-20 07:47:16 +00:00
孙华伟 d613f4ef2e *Optimize the code. 2022-04-20 15:41:22 +08:00
wangxiaomeng c49b50b422 fixbug_#21834. 2022-04-20 15:37:56 +08:00
孙广明 86a2d5bbad Merge branch 'sprint/fixbug_hufangzhou_21875' into 'master'
* Fix bug #21875.

See merge request easycorp/zentaopms!3028
2022-04-20 07:37:28 +00:00
孙广明 08d7c0bf0f Merge branch 'sprint/fixbug_hufangzhou_19716' into 'master'
* Fix bug #19716.

See merge request easycorp/zentaopms!3034
2022-04-20 07:36:43 +00:00
hufangzhou 146643d92b * Fix bug #19716. 2022-04-20 15:30:17 +08:00
孙华伟 924b03bab4 * Fix bug #15207. 2022-04-20 15:29:49 +08:00
Hao Sun 80eb71850a * bug #21867, fix sub menu position in dropdown. 2022-04-20 15:13:15 +08:00
孙广明 525365999a Merge branch 'master_xieqiyu_21642' into 'master'
* Fix bug#21642.

See merge request easycorp/zentaopms!3030
2022-04-20 07:05:07 +00:00
liyuchun 816c36770d * Fix bug #21878. 2022-04-20 15:00:13 +08:00
zenggang 7c159eeb96 * Fix bug #21823,7042 2022-04-20 06:58:50 +00:00
caoyanyi 243ef3e8fc * Add sudo param. 2022-04-20 06:33:24 +00:00
xieqiyu 565ea292d3 * Fix bug#21642. 2022-04-20 14:31:47 +08:00
Zongjun Lan a700b8994c * fix bug *19360 2022-04-20 14:22:55 +08:00
王怡栋 eeb43664cb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 14:04:22 +08:00
王怡栋 e73da94935 * code for bug #17574. 2022-04-20 14:03:53 +08:00
renying 6f8dfc3af3 Fixbug#21457 2022-04-20 14:03:50 +08:00
hufangzhou 54f2910885 * Fix bug #21875. 2022-04-20 13:44:23 +08:00
孙广明 917e317376 Merge branch 'Fix_bug_zry_21561' into 'master'
* Fix bug 21561.

See merge request easycorp/zentaopms!3027
2022-04-20 05:40:48 +00:00
zhengrunyu 406ba944eb * Fix bug 21561. 2022-04-20 13:38:22 +08:00
tanghucheng 12ebbad5c3 * Fix bug #19142. 2022-04-20 05:25:50 +00:00
李玉春 f7c8722884 Merge branch 'cyy_bug' into 'master'
* Fix bug #21861.

See merge request easycorp/zentaopms!3021
2022-04-20 05:20:04 +00:00
孙广明 2993dd202e Merge branch 'sprint/unitTest_liumengyi_report' into 'master'
* Add unit test of report.

See merge request easycorp/zentaopms!3026
2022-04-20 05:11:59 +00:00
孙广明 e4738c50ea * Add required to workflow field. 2022-04-20 13:08:20 +08:00
liumengyi 977a494efb * Add unit test of report. 2022-04-20 13:08:04 +08:00
liyuchun 006dfea82e * Fix error. 2022-04-20 11:41:11 +08:00
Hao Sun 6dc60ceead * fix issue on show avatar. 2022-04-20 11:31:36 +08:00
王怡栋 6c46a39ca1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 11:27:06 +08:00
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
李玉春 ee5948acd0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3023
2022-04-20 03:10:59 +00:00
liyuchun 284af0ded1 * Fix bug #21632. 2022-04-20 11:02:29 +08:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
孙广明 425a272096 Merge branch 'liyuchun_fixbug_12931' into 'master'
* Fix bug #20178.

See merge request easycorp/zentaopms!3020
2022-04-20 02:36:43 +00:00