Commit Graph
32185 Commits
Author SHA1 Message Date
renying d17854d07d Fixbug#21999 2022-04-29 05:11:53 +00:00
xieqiyu 88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
renying a2430ed507 Fixbug#21999 2022-04-29 03:13:32 +00:00
renying e06c2e8666 Fixbug#21999 2022-04-29 03:10:49 +00:00
王怡栋 f005a22eb8 Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3213
2022-04-29 03:09:44 +00:00
liumengyi d4ee5f773a * Fix bug. 2022-04-29 11:03:01 +08:00
renying 6a5e9b8657 Fixbug#21999 2022-04-29 02:50:51 +00:00
zenggang ac8225544f * Fix refresh jump to other branches 2022-04-29 02:43:57 +00:00
孙广明 9d5cbd6c66 Merge branch 'liyuchun_fixbug_22098' into 'master'
Liyuchun fixbug 22098

See merge request easycorp/zentaopms!3211
2022-04-29 02:31:26 +00:00
孙广明 a734294394 Merge branch 'sunhuawei_fixbug_22072' into 'master'
*Fix bug#22072.

See merge request easycorp/zentaopms!3210
2022-04-29 01:29:00 +00:00
孙华伟 92ccb504e0 Update buildform.html.php 2022-04-29 01:27:01 +00:00
liyuchun 0ac82f343c * Fix bug #21887. 2022-04-29 01:25:53 +00:00
孙华伟 d8a79b8ad9 Update buildform.html.php 2022-04-29 01:23:56 +00:00
孙华伟 92adbdef92 *Optimize the code. 2022-04-29 09:19:27 +08:00
孙华伟 ae1c8cbc61 *Fix bug#22072. 2022-04-29 09:10:39 +08:00
liyuchun 4815a5e55d * Fix bug #22098. 2022-04-29 01:01:37 +00:00
李玉春 423fc31400 Merge branch 'bug_21498' into 'master'
Fix bug#21498

See merge request easycorp/zentaopms!3206
2022-04-29 00:11:18 +00:00
王怡栋 fd924b9f73 Merge branch 'fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!3208
2022-04-28 12:01:51 +00:00
tanghucheng a2c8d78177 * Fix bug . 2022-04-28 19:59:39 +08:00
李玉春 97195c0bff Merge branch 'fixbug_sunjun_2583' into 'master'
*Fixbug_sunjun_2583

See merge request easycorp/zentaopms!3205
2022-04-28 11:51:35 +00:00
wangyidong b7792b6c44 * fix bug #14677. 2022-04-28 19:07:20 +08:00
孙广明 700b2d6bb1 Merge branch 'master' into 'liyuchun_fixbug_22074'
# Conflicts:
#   lib/filter/filter.class.php
2022-04-28 10:34:02 +00:00
孙广明 6f60b5627a Merge branch 'master_xieqiyu_22092' into 'master'
* Fix bug#22092.

See merge request easycorp/zentaopms!3199
2022-04-28 10:33:01 +00:00
孙广明 c7c2c75870 Merge branch 'sprint/master_zhouxudong_22032' into 'master'
Sprint/master zhouxudong 22032

See merge request easycorp/zentaopms!3197
2022-04-28 10:31:22 +00:00
zenggang 073b30159c * Fix bug#21498 2022-04-28 09:53:39 +00:00
wangyidong 1d9f9c0e75 * code for bug #22095. 2022-04-28 17:46:41 +08:00
hufangzhou 84d3b884e3 * Format the code. 2022-04-28 17:31:27 +08:00
sunjun f31739714a *Fixbug_sunjun_2583 2022-04-28 09:28:46 +00:00
hufangzhou 61ef0dc274 * Fix bug #15662. 2022-04-28 17:28:45 +08:00
zhouxudong 8ac71d35c5 * Fix bug #22032. 2022-04-28 09:25:28 +00:00
zhouxudong aa0e8579cf * Fix bug #22032. 2022-04-28 09:21:47 +00: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
liyuchun 83fa4afc83 * Fix bug #17968. 2022-04-28 09:02:44 +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
xieqiyu 1c1b5c64a3 * Fix bug#22092. 2022-04-28 16:25:58 +08: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