Commit Graph
41181 Commits
Author SHA1 Message Date
王怡栋 6fdf4e481d Merge branch 'sprint/210_mayue_bug#24479' into 'master'
* Fix bug #24479.

See merge request easycorp/zentaopms!4230
2022-06-29 09:07:56 +00:00
mayue 953d6c8f23 * Fix bug #24479. 2022-06-29 17:02:00 +08:00
zhujinyong 467b958ba0 * If run in container, no need check ok.txt. 2022-06-29 16:35:39 +08:00
孙广明 8dfd960d52 Merge branch 'master_xieqiyu_24395' into 'master'
* Fix bug#24395.

See merge request easycorp/zentaopms!4221
2022-06-29 08:33:39 +00:00
孙广明 065337842c Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23960.

See merge request easycorp/zentaopms!4223
2022-06-29 08:33:28 +00:00
孙广明 667c44c591 Merge branch 'fixbug_24544' into 'master'
fixbug_24544

See merge request easycorp/zentaopms!4227
2022-06-29 08:32:02 +00:00
sunjun 815e95eb6c fixbug_24544 2022-06-29 08:30:13 +00:00
王怡栋 9256ecd32c Merge branch 'master_fixbug' into 'master'
* Fix bug #24552.

See merge request easycorp/zentaopms!4226
2022-06-29 08:29:05 +00:00
tanghucheng a4966c759b * Fix bug #24552. 2022-06-29 16:27:58 +08:00
王怡栋 d674d6a919 Merge branch 'sprint/208_tianshujie_24529' into 'master'
* Fix bug #24529.

See merge request easycorp/zentaopms!4225
2022-06-29 08:26:07 +00:00
tianshujie 49a1cfa087 * Fix bug #24529. 2022-06-29 16:24:29 +08:00
孙广明 50dce20f6f * Code for action error. 2022-06-29 16:20:07 +08:00
liyuchun 31ca138b18 * Fix bug #23960. 2022-06-29 08:16:20 +00:00
王怡栋 3886d6f502 Merge branch 'sprint/208_liumengiy_fixlang' into 'master'
* Fix lang file.

See merge request easycorp/zentaopms!4222
2022-06-29 08:07:20 +00:00
liumengyi 727211ff46 * Fix lang file. 2022-06-29 15:49:05 +08:00
wangyidong 303b3fb1dd * fix bug #24076. 2022-06-29 15:43:41 +08:00
xieqiyu 7b579cfa1f * Fix bug#24395. 2022-06-29 15:37:04 +08:00
王怡栋 fe92dad1c3 Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
* Fix bug #24533.

See merge request easycorp/zentaopms!4219
2022-06-29 07:30:20 +00:00
王怡栋 9a334546a0 Merge branch 'master_xieqiyu_24394' into 'master'
* Fix bug#24394.

See merge request easycorp/zentaopms!4214
2022-06-29 07:27:43 +00:00
tianshujie 32af972947 * Fix bug #24533. 2022-06-29 15:25:38 +08:00
孙广明 e54064bcfe Merge branch 'sprint/master_zhouxudong_projectBug' into 'master'
Sprint/master zhouxudong project bug

See merge request easycorp/zentaopms!4215
2022-06-29 07:11:40 +00:00
zhouxudong 0a86bc474f * Fix bug #24417. 2022-06-29 07:10:13 +00:00
孙广明 102beda14d Merge branch 'sprint/208_liumengyi_686' into 'master'
* Fix bug #24487, #24415.

See merge request easycorp/zentaopms!4213
2022-06-29 06:57:14 +00:00
孙广明 b2061d31e1 Merge branch 'sprint/208_tianshujie_issue687' into 'master'
* Resolve issue #687.

See merge request easycorp/zentaopms!4217
2022-06-29 06:37:40 +00:00
孙广明 4462973de3 Merge branch 'sprint/208_tianshujie_24514' into 'master'
Sprint/208 tianshujie 24514

See merge request easycorp/zentaopms!4216
2022-06-29 06:37:06 +00:00
tianshujie 3c31a80784 * To remove a null value. 2022-06-29 14:35:31 +08:00
tianshujie 1f185ff189 * Fix bug #24514. 2022-06-29 14:34:09 +08:00
liumengyi 631c9c9a36 * Finish task #24415. 2022-06-29 14:33:28 +08:00
zhouxudong a1794e7ef6 * Finish task #24398. 2022-06-29 06:27:01 +00:00
xieqiyu 36d6687438 * Fix bug#24394. 2022-06-29 14:18:35 +08:00
zhouxudong afb37ddeeb * Fix bug #24398. 2022-06-29 06:15:44 +00:00
liumengyi 30e6558572 * Fix bug #24487. 2022-06-29 14:07:47 +08:00
孙广明 d0924667d0 Merge branch 'sgm_task#58773' into 'master'
* Finish task #58771.

See merge request easycorp/zentaopms!4212
2022-06-29 06:07:38 +00:00
zhouxudong e29b10e88d * Fix bug #24398. 2022-06-29 05:54:49 +00:00
tianshujie 20c4a2b8b4 * Resolve issue #687. 2022-06-29 13:53:51 +08:00
孙广明 6c777a0a97 * Finish task #58771. 2022-06-29 13:50:57 +08:00
王怡栋 08d27f8d79 Merge branch 'sprint/208_tianshujie_24365' into 'master'
* Fix bug #24365.

See merge request easycorp/zentaopms!4210
2022-06-29 05:41:36 +00:00
tianshujie 105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
李玉春 4b2165be06 Merge branch 'sprint/zentaoat_liyang' into 'master'
*Fix Bug for copyDB

See merge request easycorp/zentaopms!4209
2022-06-29 05:38:55 +00:00
孙广明 c266884a88 Merge branch 'cyy_gitlab' into 'master'
* Modify gitlab token check and repo create gitlab list.

See merge request easycorp/zentaopms!4204
2022-06-29 05:37:20 +00:00
liyang 618be4ce3c *Fix Bug for copyDB 2022-06-29 13:36:30 +08:00
王怡栋 19f69fa354 Merge branch 'sprint/208_liumengyi_686' into 'master'
* Fix issue #686.

See merge request easycorp/zentaopms!4208
2022-06-29 05:35:33 +00:00
孙广明 4dc9c76e9c Merge branch 'sprint209_leiyong_task_58578' into 'master'
* Finish task#58578.

See merge request easycorp/zentaopms!4200
2022-06-29 05:34:12 +00:00
liumengyi 6669ccb37a * Fix issue #686. 2022-06-29 13:34:09 +08:00
孙广明 d49c660900 Merge branch 'fixbug_24438' into 'master'
fixbug_24438

See merge request easycorp/zentaopms!4206
2022-06-29 05:33:56 +00:00
朱金勇 972449c77a Merge branch 'sprint/209_hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!4207
2022-06-29 05:29:10 +00:00
孙广明 b9f3120c8b * Fix bug #24508. 2022-06-29 13:29:03 +08:00
wangyidong 8ee7afc941 * fix bug #24104. 2022-06-29 13:26:58 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
sunjun d0bfee6d69 fixbug_24438 2022-06-29 05:11:49 +00:00