Commit Graph
32185 Commits
Author SHA1 Message Date
孙广明 d4f02a3d88 Merge branch 'mayue_fix_bug#19933#21785' into 'master'
* Fix bug #19933#21785.

See merge request easycorp/zentaopms!3064
2022-04-21 08:32:51 +00:00
mayue 5da98433b6 * Fix bug #19933#21785. 2022-04-21 16:30:32 +08:00
王怡栋 f93e474e26 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18934#21853

See merge request easycorp/zentaopms!3063
2022-04-21 08:24:08 +00:00
Zongjun Lan 2414c6d1dc * fix bug #18934 2022-04-21 16:23:16 +08:00
孙广明 1b62b01fe8 Merge branch 'liyuchun_fixbug_20178' into 'master'
* Fix bug #20178.

See merge request easycorp/zentaopms!3060
2022-04-21 08:19:26 +00:00
Zongjun Lan 7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
wangxiaomeng 8cec8ea0bd fixbug_21650. 2022-04-21 16:00:44 +08:00
tianshujie ec0faba808 * Fix bug #18060. 2022-04-21 15:59:45 +08:00
liyuchun 6726e65206 * Fix bug #20178. 2022-04-21 15:59:21 +08:00
tianshujie edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
王怡栋 89e1854932 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-21 15:39:05 +08:00
王怡栋 7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
孙广明 3ac0ae876c Merge branch 'mayue_fix_bug21904' into 'master'
* Fix bug #21904.

See merge request easycorp/zentaopms!3059
2022-04-21 07:18:06 +00:00
孙广明 47962dc5b2 Merge branch 'master_xieqiyu_2598' into 'master'
* Fix bug#2598.

See merge request easycorp/zentaopms!3053
2022-04-21 07:15:41 +00:00
mayue 5f5cc8768e * Fix bug #21904. 2022-04-21 15:04:59 +08:00
王怡栋 9f68a5c608 Merge branch 'fixbug' into 'master'
* Fix bug #18266.

See merge request easycorp/zentaopms!3055
2022-04-21 06:55:30 +00:00
hufangzhou 2dc575a760 * Fix bug #11074. 2022-04-21 14:53:38 +08:00
孙广明 63f22116a4 Merge branch 'fixbugs_zhouxin_2296,1832' into 'master'
* Fix bug #2296,#1832.

See merge request easycorp/zentaopms!3054
2022-04-21 05:53:47 +00:00
zhouxin 8ec6de5fb5 * Fix bug #2296,#1832. 2022-04-21 05:50:05 +00:00
tanghucheng 700c706916 * Fix bug #18266. 2022-04-21 05:33:41 +00:00
xieqiyu c87d9a96a5 * Fix bug#2598. 2022-04-21 13:15:49 +08:00
李玉春 5d1b39b4a6 Merge branch 'sprint/fixbug_liumengyi_19143' into 'master'
* Fix bug #19143.

See merge request easycorp/zentaopms!3052
2022-04-21 05:12:22 +00:00
liumengyi 3c053ada91 * Add english lang item. 2022-04-21 13:11:14 +08:00
liumengyi 80bbd19c9d * Fix bug #19143. 2022-04-21 13:00:36 +08:00
王怡栋 abc8eed00e Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3050
2022-04-21 02:41:40 +00:00
renying d02cb94ab6 Fixbug#21457 2022-04-21 10:41:24 +08:00
孙广明 e4295fdbe5 * Code for workflow bug. 2022-04-21 10:40:56 +08:00
孙广明 7fb3a62058 * Fix workflow bug. 2022-04-21 10:24:25 +08:00
孙广明 57a39efdea * Fix bug #17618. 2022-04-21 10:17:47 +08:00
孙广明 d48e22cad9 * Fix bug #17618. 2022-04-21 10:16:01 +08:00
tanghucheng 37514f79c3 * Fix bug #21370 for update. 2022-04-21 02:08:47 +00:00
王怡栋 c5f4ad704e Merge branch 'fixbug' into 'master'
* Fix bug #19142.

See merge request easycorp/zentaopms!3041
2022-04-21 01:34:48 +00:00
王怡栋 3e29be515f Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *19360

See merge request easycorp/zentaopms!3029
2022-04-21 01:33:48 +00:00
Zongjun Lan cc17a999ec * fix code 2022-04-21 09:32:11 +08:00
renying b32081bab7 Fixbug#21457 2022-04-21 09:27:36 +08:00
hufangzhou d4f1453db1 * Fix bug #19984. 2022-04-21 09:26:15 +08:00
孙广明 ac0eb8c657 Merge branch 'liyuchun_fixbug_21632' into 'master'
* Fix bug #21632.

See merge request easycorp/zentaopms!3024
2022-04-21 01:22:29 +00:00
孙广明 5f18c15827 Merge branch 'fixbug_sunjun_21811' into 'master'
*Fixbug_sunjun_21811

See merge request easycorp/zentaopms!3040
2022-04-21 01:17:53 +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
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