Commit Graph
34415 Commits
Author SHA1 Message Date
孙广明 39c8e0a2e7 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1957
2022-02-24 08:09:43 +00:00
zhujinyong e21fe4bf8a Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-24 16:02:40 +08:00
zhujinyong c7708b55cc * Adjust style of vision switcher. 2022-02-24 16:02:17 +08:00
李玉春 ceb94155c5 Merge branch 'sgm_fixbug' into 'sprint/185'
* Fix group bug.

See merge request easycorp/zentaopms!1956
2022-02-24 07:43:44 +00:00
孙广明 59f2dc528b Merge branch 'sprint/186_liumengyi_19955' into 'sprint/185'
* Finish bug #19955.

See merge request easycorp/zentaopms!1952
2022-02-24 07:41:54 +00:00
孙广明 f9ed1e1dd9 * Fix group bug. 2022-02-24 15:41:12 +08:00
李玉春 c3cc3eabd9 Merge branch 'sprint/185_fixbug_zxd' into 'sprint/185'
Sprint/185 fixbug zxd

See merge request easycorp/zentaopms!1955
2022-02-24 07:38:05 +00:00
zhouxudong 8a9824bc98 * Fix bug . 2022-02-24 15:28:01 +08:00
zhouxudong 88163d846f * Fix bug . 2022-02-24 15:22:12 +08:00
孙广明 bdaf8ced98 Merge branch 'sprint/185_zhouxin_49281' into 'sprint/185'
Sprint/185 zhouxin 49281

See merge request easycorp/zentaopms!1950
2022-02-24 07:19:35 +00:00
zhouxin 74a2b622f4 Adjust code. 2022-02-24 07:15:07 +00:00
zhouxin 132cbb4aaa Adjust code. 2022-02-24 06:59:39 +00:00
zhujinyong 0ba3f443cf * Fix loadExtension. 2022-02-24 14:58:02 +08:00
李玉春 140fce609f Merge branch 'sprint/185_fixbug_19999' into 'sprint/185'
* Fixbug 19999.

See merge request easycorp/zentaopms!1953
2022-02-24 06:53:32 +00:00
zhengrunyu 8d34b3ef8b *Fixbug 19999. 2022-02-24 14:52:56 +08:00
zhengrunyu 4e392ea7b2 * Fixbug 19999. 2022-02-24 14:48:36 +08:00
liumengyi 74585f71d0 * Finish bug #19955. 2022-02-24 14:40:17 +08:00
王怡栋 d620a49720 Merge branch 'sprint/185_lanzongjun_49361' into 'sprint/185'
* Fix #49361

See merge request easycorp/zentaopms!1949
2022-02-24 06:29:20 +00:00
王怡栋 70f5a88ee1 Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* fix bug.

See merge request easycorp/zentaopms!1951
2022-02-24 06:28:59 +00:00
tanghucheng 0a0746fcce * fix bug. 2022-02-24 14:27:42 +08:00
Zongjun Lan 553c7d714a * Fix #49361 2022-02-24 14:14:14 +08:00
李玉春 aa80c991d3 Merge branch 'spring/185_Fixbug_' into 'sprint/185'
* Fix bug.

See merge request easycorp/zentaopms!1948
2022-02-24 06:02:05 +00:00
zhengrunyu 13882f5a5b * Fix bug. 2022-02-24 13:59:37 +08:00
孙广明 f785af25c3 Merge branch 'sprint/186_tianshujie_fixbug' into 'sprint/185'
Sprint/186 tianshujie fixbug

See merge request easycorp/zentaopms!1946
2022-02-24 05:38:40 +00:00
李玉春 47fc9d3201 Merge branch 'sprint/185_zhouxudong_19363' into 'sprint/185'
* Fix bug #19363.

See merge request easycorp/zentaopms!1944
2022-02-24 05:31:08 +00:00
孙广明 b59b9cfba4 Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.

See merge request easycorp/zentaopms!1947
2022-02-24 05:28:15 +00:00
zhouxin 94b5789959 Fix bug. 2022-02-24 05:26:15 +00:00
李玉春 03920c81f4 Merge branch 'sprint/zxd_fixbug_19685' into 'sprint/185'
* FIx bug #19685.

See merge request easycorp/zentaopms!1945
2022-02-24 05:22:20 +00:00
zhouxudong 6a6700b932 * FIx bug #19685. 2022-02-24 13:18:16 +08:00
王怡栋 392c0d7264 Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49355

See merge request easycorp/zentaopms!1933
2022-02-24 05:13:38 +00:00
tianshujie 70a665df3c * Modify course loading path. 2022-02-24 13:11:48 +08:00
zhouxudong 02a79e87d7 * Fix bug #19363. 2022-02-24 13:11:45 +08:00
Zongjun Lan cf40dbba88 remove a line 2022-02-24 13:11:37 +08:00
李玉春 e1bf52d8d0 Merge branch 'sgm_upgrade' into 'sprint/185'
* Fix bug.

See merge request easycorp/zentaopms!1943
2022-02-24 05:10:31 +00:00
孙广明 0fb9182101 * Fix bug. 2022-02-24 13:07:25 +08:00
王怡栋 9110284649 Merge branch 'sprint/185_fixbug_lanzongjun_19903' into 'sprint/185'
* Fix bug #19903

See merge request easycorp/zentaopms!1941
2022-02-24 05:05:56 +00:00
王怡栋 56969ec4e3 Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* Finish task #49376,49365,49366.

See merge request easycorp/zentaopms!1937
2022-02-24 05:05:25 +00:00
zhujinyong ff8694661d Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-24 13:04:49 +08:00
孙广明 4695a2bd83 Merge branch 'sprint/185_xieqiqyu_fixbug' into 'sprint/185'
* Fix bug#19974.

See merge request easycorp/zentaopms!1940
2022-02-24 05:04:34 +00:00
zhujinyong 43998c45bb * Fix vision switcher. 2022-02-24 13:04:25 +08:00
王怡栋 2091050222 Merge branch 'sgm_upgrade' into 'sprint/185'
* Refactor code.

See merge request easycorp/zentaopms!1930
2022-02-24 05:03:01 +00:00
tianshujie f7f9450c79 * Modify course playback path. 2022-02-24 12:11:45 +08:00
zhangzilong 7abab086a9 * Finish task #49280. 2022-02-24 11:31:37 +08:00
李玉春 8c8abcaba5 Merge branch 'sprint/185_zhengrunyu_Fixbug_19953' into 'sprint/185'
* Fixbug 19953.

See merge request easycorp/zentaopms!1942
2022-02-24 03:28:56 +00:00
zhengrunyu 9f6eb6c7a5 * Remove (). 2022-02-24 11:27:02 +08:00
Zongjun Lan e8b085129b * Fix bug #19903 2022-02-24 11:19:38 +08:00
zhengrunyu 172b62dbfb * Fixbug 19953. 2022-02-24 11:18:44 +08:00
xieqiyu 76a66dd3e9 * Fix bug#19974. 2022-02-24 11:03:54 +08:00
tianshujie 22147a542c * Fix Kanban import bug menu error. 2022-02-24 11:02:55 +08:00
zhouxin baa5d32ef1 Finish task #49281. 2022-02-24 02:54:24 +00:00