Commit Graph
44383 Commits
Author SHA1 Message Date
liuhong 4aff831a07 *Fix bug #66217. 2022-08-31 11:20:09 +00:00
liuhong 83639aaa07 *Fix bug 66217 2022-08-31 06:58:11 +00:00
liuhong b0c1f7c868 *Fix bug #66217. 2022-08-31 06:16:09 +00:00
liuhong 18d6ed7f2d *Fix bug #66217. 2022-08-31 06:13:31 +00:00
liuhong 3dfd3ecfca *Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619. 2022-08-30 04:08:38 +00:00
王怡栋 b9c8994857 Merge branch 'sprint/ZUI_guofeilong_fix_confilc_problem' into 'master'
* Fix confilct problem

See merge request easycorp/zentaopms!5191
2022-08-30 00:47:30 +00:00
guofeilong e23fec4835 * Fix confilct problem 2022-08-30 00:43:41 +00:00
王怡栋 11f225dfb0 Merge branch 'master_liuhong_66461' into 'master'
*Fix bug #66461.

See merge request easycorp/zentaopms!5180
2022-08-30 00:31:45 +00:00
liuhong 806dddb5e0 *Fix bug #66461. 2022-08-30 00:30:00 +00:00
王怡栋 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
李玉春 0c70cc0109 Merge branch 'sprint/sunhao/zui' into 'master'
*fix $.createLink missing extra params.

See merge request easycorp/zentaopms!5188
2022-08-29 09:09:10 +00:00
Hao Sun 2a63d83df8 *fix $.createLink missing extra params. 2022-08-29 09:03:13 +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
孙广明 870765fe8b Merge branch 'sprint/235_liumengyi_fixbug' into 'master'
* Fix bug #23957, #26846.

See merge request easycorp/zentaopms!5183
2022-08-29 07:18:01 +00:00
tanghucheng 8514669f10 * Fix bug #26996. 2022-08-29 15:15:57 +08: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
孙广明 469ea747cc Merge branch 'sprint/tianshujie_bug26936' into 'master'
* Fix bug #26936.

See merge request easycorp/zentaopms!5181
2022-08-29 06:52:31 +00:00
tianshujie a072b794e5 * Fix bug #26936. 2022-08-29 14:51:21 +08:00
liuhong e69ab6d423 *Fix bug #66461. 2022-08-29 05:55:32 +00:00
liuhong 1a683550d1 *Fix bug #66461. 2022-08-29 05:38:18 +00: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
孙广明 7915eab446 Merge branch 'sprint/tianshujie_case' into 'master'
* Add case of execution modules.

See merge request easycorp/zentaopms!5171
2022-08-29 02:53:24 +00:00
tianshujie 2e17f47723 * Add case of execution modules. 2022-08-29 10:39:27 +08:00
王怡栋 440123cd84 Merge branch 'sprint/lanzongjun_testunit' into 'master'
finish my and weekly testcase

See merge request easycorp/zentaopms!5167
2022-08-29 02:31:58 +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
王怡栋 4605fea6e2 Merge branch 'fixbug' into 'master'
* Fix bug #26924.

See merge request easycorp/zentaopms!5169
2022-08-29 02:19:10 +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
lanzongjun 0619837e8c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-08-29 10:01:00 +08:00
xieqiyu daafaea271 * Fix bug#26948. 2022-08-29 09:33:38 +08:00