Commit Graph
31799 Commits
Author SHA1 Message Date
hufangzhou 61ef0dc274 * Fix bug #15662. 2022-04-28 17:28:45 +08:00
孙广明 2db91483d3 Merge branch 'sprint/master_zhouxudong_22038' into 'master'
* Fix bug #22038.

See merge request easycorp/zentaopms!3163
2022-04-28 09:11:30 +00:00
王怡栋 9850bfa641 Merge branch 'sprint/fixbug_hufangzhou_22102' into 'master'
* Fix bug #22102.

See merge request easycorp/zentaopms!3201
2022-04-28 08:52:13 +00:00
王怡栋 35c6389735 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22019

See merge request easycorp/zentaopms!3195
2022-04-28 08:51:30 +00:00
tanghucheng 650db6bbf6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-04-28 16:49:58 +08:00
tanghucheng ebde9241cf * Fix bug. 2022-04-28 16:49:03 +08:00
王怡栋 a1f011506d Merge branch 'sgm_fixbug' into 'master'
* Fix bug #14997.

See merge request easycorp/zentaopms!3184
2022-04-28 08:47:17 +00:00
tanghucheng 7442260c49 * Fix bug . 2022-04-28 16:47:11 +08:00
王怡栋 a0c13f4d80 Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181
2022-04-28 08:46:46 +00:00
hufangzhou c5037322ff * Fix bug #22102. 2022-04-28 16:33:14 +08:00
李玉春 e6c646f6bd Merge branch 'sprint/fixbug_liumengyi_2441' into 'master'
* Fix bug #2441.

See merge request easycorp/zentaopms!3198
2022-04-28 08:26:06 +00:00
李玉春 af548546d7 Merge branch 'bug_2939' into 'master'
Fix bug#2939,18683

See merge request easycorp/zentaopms!3189
2022-04-28 08:22:17 +00:00
liumengyi 2780f01d00 * Fix bug #2441. 2022-04-28 16:21:37 +08:00
李玉春 a9cff5cb20 Merge branch 'sunhuawei_fixbug_18180' into 'master'
*Fix bug#18180

See merge request easycorp/zentaopms!3182
2022-04-28 08:21:28 +00:00
zhouxudong d6d13aa14b * Fix bug #22038. 2022-04-28 08:12:11 +00:00
zhouxudong b6a70926ab * Fix bug #22038. 2022-04-28 08:09:57 +00:00
mayue 3d55d30a92 * Optimize code. 2022-04-28 07:54:22 +00:00
mayue 94c3a3a270 * Fix bug #10878. 2022-04-28 07:50:01 +00:00
lanzongjun 3bdab60664 * fix bug #22019 2022-04-28 15:48:24 +08:00
孙华伟 d8d0d71e3e *Optimize the bug. 2022-04-28 15:06:59 +08:00
孙广明 ccb5ff6a2f Merge branch 'sprint/fixbug_liumengyi_18405' into 'master'
* Fix bug #18405.

See merge request easycorp/zentaopms!3190
2022-04-28 07:03:58 +00:00
mayue ba0ddd3ca3 * Fix bug #22069. 2022-04-28 06:58:12 +00:00
mayue aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00:00
liumengyi 50584a07dd * Fix bug #18405. 2022-04-28 14:37:04 +08:00
孙华伟 9395fe3210 *Fix new bug. 2022-04-28 14:33:40 +08:00
zenggang 45b7cbd186 * Fix bug#2939,18683 2022-04-28 06:23:26 +00:00
孙广明 8d8b999608 Merge branch 'fixbug_sunjun_17329' into 'master'
*Fixbug_sunjun_17329

See merge request easycorp/zentaopms!3188
2022-04-28 06:23:11 +00:00
孙广明 1cb36eb72c Merge branch 'liyuchun_fixbug_22074' into 'master'
* Fix bug #22075.

See merge request easycorp/zentaopms!3185
2022-04-28 06:22:29 +00:00
李玉春 9e3fa76383 Merge branch 'cyy_7006' into 'master'
* Fix bug #7006.

See merge request easycorp/zentaopms!3187
2022-04-28 06:20:23 +00:00
liyuchun 11af6b43a2 * Fix bug #15245. 2022-04-28 06:19:27 +00:00
sunjun 7f7f3013ea *Fixbug_sunjun_17329 2022-04-28 06:18:13 +00:00
caoyanyi 5fd5b34e97 * Modify check ip function. 2022-04-28 14:06:08 +08:00
liyuchun 81903f2fe5 * Fix bug #15563. 2022-04-28 06:05:39 +00:00
caoyanyi d517513c69 * Fix bug #7006. 2022-04-28 14:03:33 +08:00
孙广明 f3c333119c Merge branch 'fixbugs_zhouxin' into 'master'
* Adjust code.

See merge request easycorp/zentaopms!3186
2022-04-28 05:59:16 +00:00
tanghucheng 94e566a309 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-04-28 13:58:15 +08:00
zhouxin 2178892254 * Fix bug #21929. 2022-04-28 05:56:51 +00:00
tanghucheng c04c165276 * Fix bug #21429. 2022-04-28 13:50:48 +08:00
liyuchun b65976522e * Fix bug #22074. 2022-04-28 05:49:13 +00:00
zhouxin 1cd78770ef * Adjust code. 2022-04-28 05:47:02 +00:00
liyuchun 1729e30cb4 * Fix bug #22075. 2022-04-28 05:46:42 +00:00
孙广明 aff78c6d45 Merge branch 'fixbug_sunjun_17828' into 'master'
*Fixbug_sunjun_17828

See merge request easycorp/zentaopms!3183
2022-04-28 05:30:05 +00:00
孙广明 e3ff7b36e6 * Fix bug #14997. 2022-04-28 13:28:09 +08:00
sunjun 445279bb1a *Fixbug_sunjun_17828 2022-04-28 05:26:17 +00:00
孙华伟 c11b818bc0 Update privbygroup.html.php 2022-04-28 05:20:26 +00:00
孙华伟 0cd1a57430 Update en.php 2022-04-28 05:18:35 +00:00
孙华伟 2817457166 *Add english. 2022-04-28 13:17:06 +08:00
zhouxudong c89922b002 * Fix bug #22038. 2022-04-28 05:16:24 +00:00
孙华伟 95db914e93 *Optimize the bug. 2022-04-28 13:15:24 +08:00
zhouxudong 79675da1e0 * Fix bug #220.38. 2022-04-28 05:11:23 +00:00