Commit Graph
36557 Commits
Author SHA1 Message Date
王怡栋 22b6282461 Merge branch 'master_liuhong_26239' into 'master'
*Fix bug before 26239.

See merge request easycorp/zentaopms!5177
2022-08-30 00:17:12 +00:00
王怡栋 09b0a8c3c5 Merge branch 'fixbug' into 'master'
* Fix bug #26984.

See merge request easycorp/zentaopms!5182
2022-08-29 08:06:33 +00:00
王怡栋 f42b17f605 Update control.php 2022-08-29 08:06:10 +00:00
王怡栋 5b56d7b2f1 Merge branch 'sprint/231_zg_bugs' into 'master'
* Fix sprint231 bugs

See merge request easycorp/zentaopms!5184
2022-08-29 08:03:22 +00:00
王怡栋 5d36f71815 Merge branch 'master_xieqiyu_27010' into 'master'
* Fix bug#27010.

See merge request easycorp/zentaopms!5185
2022-08-29 08:02:35 +00:00
xieqiyu ea98130180 * Fix bug#27010. 2022-08-29 15:35:01 +08:00
zenggang 062af71ff8 * Fix sprint231 bugs 2022-08-29 07:23:32 +00:00
liumengyi 9b0f6544df * Fix bug #23957, #26846. 2022-08-29 15:11:21 +08:00
tanghucheng ddb8ddaacf * Code for bug #26984. 2022-08-29 15:03:20 +08:00
tanghucheng 9b2613b6e7 * Fix bug #26984. 2022-08-29 14:59:37 +08:00
tianshujie a072b794e5 * Fix bug #26936. 2022-08-29 14:51:21 +08:00
王怡栋 61999b0462 Merge branch 'master_xieqiyu_26991' into 'master'
* Fix bug#26991.

See merge request easycorp/zentaopms!5179
2022-08-29 05:38:16 +00:00
王怡栋 20ac7bdecb Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26983

See merge request easycorp/zentaopms!5175
2022-08-29 05:32:26 +00:00
xieqiyu 97369a949c * Fix bug#26897. 2022-08-29 13:31:54 +08:00
lanzongjun c26a7c3a3a * fix bug #26990 2022-08-29 13:28:13 +08:00
xieqiyu fe9228b394 * Fix bug#26897. 2022-08-29 13:26:58 +08:00
xieqiyu c3ba9e70ae * Fix bug#26897. 2022-08-29 13:26:11 +08:00
xieqiyu 95b7f73452 * Fix bug#26991. 2022-08-29 13:20:05 +08:00
wangyidong 8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
lanzongjun e8ffd8d912 * fix bug #26983 2022-08-29 11:13:46 +08:00
liuhong ceae38f4e1 *Fix bug before 26239. 2022-08-29 03:12:43 +00:00
孙广明 0fc0a2684e Merge branch 'sprint231_bug_26939' into 'master'
* Fix bug#26939

See merge request easycorp/zentaopms!5161
2022-08-29 02:55:19 +00:00
曾刚 72194dcc1a * Fix bug#26939 2022-08-29 02:55:19 +00:00
孙广明 9722d6afd0 Merge branch 'sprint/235_tianshujie_26936' into 'master'
* Fix bug #26936.

See merge request easycorp/zentaopms!5168
2022-08-29 02:25:42 +00:00
王怡栋 c2752a14ac Merge branch 'master_xieqiyu_26948' into 'master'
* Fix bug#26948.

See merge request easycorp/zentaopms!5166
2022-08-29 02:20:51 +00:00
王怡栋 9cfb3f6d10 Merge branch 'sprint/hufangzhou_26420' into 'master'
* Fix bug #26420.

See merge request easycorp/zentaopms!5165
2022-08-29 02:20:18 +00:00
tanghucheng 5660267ec2 * Fix bug #26924. 2022-08-29 10:14:18 +08:00
tianshujie 915baa54b5 * Fix bug #26936. 2022-08-29 10:09:10 +08:00
xieqiyu daafaea271 * Fix bug#26948. 2022-08-29 09:33:38 +08:00
hufangzhou 92e0ec8eae * Fix bug #26420. 2022-08-29 09:32:23 +08:00
王怡栋 29ccc1512c Merge branch 'sprint/231_dongli_bug24387' into 'master'
* Fix bug #24387.

See merge request easycorp/zentaopms!5164
2022-08-29 00:49:15 +00:00
王怡栋 8a22b73e0e Merge branch 'master_xieqiyu_26779' into 'master'
Master xieqiyu 26779

See merge request easycorp/zentaopms!5159
2022-08-29 00:49:03 +00:00
王怡栋 36d2dce485 Merge branch 'sprint/231_tianshujie_26936' into 'master'
* Fix bug #26936.

See merge request easycorp/zentaopms!5158
2022-08-29 00:46:46 +00:00
dongli 914ab9d955 * Delete useless files. 2022-08-28 13:28:59 +00:00
dongli 25fe8cd518 * Fix bug #24387. 2022-08-28 11:57:16 +00:00
tanghucheng 663434a666 * Code for story import. 2022-08-27 21:55:30 +08:00
xieqiyu 34ec8c0a22 * Fix bug#26779. 2022-08-26 16:47:22 +08:00
tianshujie aa0f16c8e8 * Fix bug #26936. 2022-08-26 16:31:41 +08:00
liumengyi fac28b389a * Fix bug #26724. 2022-08-26 16:12:07 +08:00
孙广明 5b759d1676 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5155
2022-08-26 07:46:16 +00:00
王怡栋 69674273fe Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5154
2022-08-26 07:45:42 +00:00
tianshujie eb6b6b061f * Fix bug #26950. 2022-08-26 15:34:18 +08:00
liumengyi 18efebc505 * Fix bug. 2022-08-26 15:33:46 +08:00
tianshujie e45c8da5c8 * Fix bug #26954. 2022-08-26 15:32:33 +08:00
tianshujie ae8f299b55 * Fix bug #26950. 2022-08-26 15:25:17 +08:00
王怡栋 7345d4e036 Merge branch 'fix_bug#26945' into 'master'
* Fix bug #26945.

See merge request easycorp/zentaopms!5153
2022-08-26 07:23:28 +00:00
mayue 3952e3d312 * Fix bug #26945. 2022-08-26 15:22:00 +08:00
王怡栋 5077173b8b Merge branch 'master_xieqiyu_26898' into 'master'
* Fix bug#26898.

See merge request easycorp/zentaopms!5152
2022-08-26 07:21:30 +00:00
tianshujie 12e8aebfb2 * Fix bug #26946. 2022-08-26 15:18:58 +08:00
xieqiyu edfb5c538c * Fix bug#26898. 2022-08-26 15:16:50 +08:00