Commit Graph
37984 Commits
Author SHA1 Message Date
zenggang 7688d211d3 * Fix bug#21981 2022-04-26 06:21:15 +00:00
zenggang 9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
李玉春 2aa57d045b Merge branch 'cyy_bug' into 'master'
* Fix unlink file error.

See merge request easycorp/zentaopms!3115
2022-04-26 03:11:42 +00:00
wangyidong 5acdc8964c * fix bug #22001. 2022-04-26 10:14:04 +08:00
wangyidong 27e377d1fb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-26 09:52:04 +08:00
wangyidong f4e295ac8e * adjust for sso. 2022-04-26 09:51:55 +08:00
wangyidong f77b7875cc * adjust for kilin. 2022-04-26 09:46:33 +08:00
孙广明 52bfa3e1c6 Merge branch 'sprint/master_zhoxuudong_21984' into 'master'
* Fix bug #21984.

See merge request easycorp/zentaopms!3116
2022-04-26 01:08:57 +00:00
zhouxudong ed3f3bd7b4 * Fix bug #21984. 2022-04-26 01:06:30 +00:00
caoyanyi 2df290f018 * Fix bug #19311. 2022-04-26 09:04:11 +08:00
caoyanyi 559796b512 * Fix unlink file error. 2022-04-26 08:35:06 +08:00
李玉春 16a626adf0 Merge branch 'bug_15658' into 'master'
Fix bug#15658,15644

See merge request easycorp/zentaopms!3112
2022-04-26 00:25:28 +00:00
王怡栋 c2800dc279 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #14842

See merge request easycorp/zentaopms!3114
2022-04-25 09:38:01 +00:00
lanzongjun 956f302c57 * fix bug #14842 2022-04-25 17:27:56 +08:00
孙广明 d3aaac869c Merge branch 'sprint/scx_fixstorybug' into 'master'
* Fix bug #21992.

See merge request easycorp/zentaopms!3113
2022-04-25 09:27:24 +00:00
王怡栋 d9efb65f46 Merge branch 'fixbug' into 'master'
* Fix bug #18209.

See merge request easycorp/zentaopms!3111
2022-04-25 09:24:23 +00:00
= 38137c5960 * Fix bug #21992. 2022-04-25 17:23:12 +08:00
王怡栋 f76be66917 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #16663#17626

See merge request easycorp/zentaopms!3108
2022-04-25 09:22:47 +00:00
zenggang 8b54060132 * Fix bug#15658,15644 2022-04-25 09:11:13 +00:00
lanzongjun beb2ec67de * fix bug #17626 2022-04-25 17:11:13 +08:00
tanghucheng 66ee1b0ffe * Fix bug . 2022-04-25 17:01:43 +08:00
lanzongjun 5927f8e586 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-25 16:45:39 +08:00
wangyidong f208fcea12 * fix error. 2022-04-25 15:58:32 +08:00
wangyidong 875d7bd93f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-25 15:20:20 +08:00
wangyidong 668637fc18 * adjust for web page. 2022-04-25 15:20:05 +08:00
孙广明 37733991df Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3107
2022-04-25 06:42:26 +00:00
朱金勇 35ae55a75b Merge branch 'sprint/fixbug_hufangzhou_apilib' into 'master'
* Rebuild api lib code.

See merge request easycorp/zentaopms!3110
2022-04-25 06:35:09 +00:00
hufangzhou 84f763e4b9 * Rebuild api lib code. 2022-04-25 14:11:51 +08:00
lanzongjun c480a5203c * fix bug #16663 2022-04-25 13:52:37 +08:00
李玉春 409115aaaa Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3106
2022-04-25 05:33:23 +00:00
sunjun 1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00
tianshujie 873fabb024 * Fix bug #21970. 2022-04-25 10:50:46 +08:00
wangyidong 580132c2c8 * code for bug #18347. 2022-04-25 10:36:08 +08:00
tianshujie 42676bf558 * Adjust the scope of modules when searching for bugs. 2022-04-25 01:27:24 +00:00
wangyidong bf252f261c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-25 08:56:04 +08:00
wangyidong 0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
王怡栋 4f1690ca0e Merge branch 'liyuchun_fixbug_14805' into 'master'
* Fix bug #14805.

See merge request easycorp/zentaopms!3104
2022-04-24 09:26:29 +00:00
王怡栋 4f111c37f3 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
Sprint/master lanzongjun fixbug

See merge request easycorp/zentaopms!3103
2022-04-24 09:24:42 +00:00
王怡栋 b69bc3989d Merge branch 'master_xieqiyu_2974' into 'master'
* Fix bug#2974.

See merge request easycorp/zentaopms!3100
2022-04-24 09:24:13 +00:00
liyuchun d960846c16 * Fix bug #14805. 2022-04-24 09:10:01 +00:00
Zongjun Lan eb0be01303 * fix bug #18249 2022-04-24 16:09:00 +08:00
wangyidong c2f6b3220a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-24 16:08:55 +08:00
wangyidong a7bc51b608 * code bug #18835. 2022-04-24 16:08:28 +08:00
朱金勇 59c514fda8 Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3102
2022-04-24 08:07:07 +00:00
zhengrunyu 94d4a6acd9 * Fix param. 2022-04-24 16:05:21 +08:00
zhengrunyu bc86b34e6d * Delete black. 2022-04-24 16:00:55 +08:00
zhengrunyu 0001e7b16b * Fix bug 21319. 2022-04-24 15:58:25 +08:00
李玉春 c4de8de736 Merge branch 'sprint/fixbug_liumengyi_13255' into 'master'
* Fix bug #13255.

See merge request easycorp/zentaopms!3101
2022-04-24 07:54:35 +00:00
liumengyi 78bd314db5 * Fix bug #13255. 2022-04-24 15:50:21 +08:00
xieqiyu cf9add7555 * Fix bug#2974. 2022-04-24 15:48:13 +08:00