Commit Graph
34391 Commits
Author SHA1 Message Date
Zongjun Lan 9200c8174f * fix task 49340 2022-03-01 13:33:20 +08:00
Zongjun Lan 449b45b918 * fix task 49340 2022-02-28 13:25:34 +08:00
Zongjun Lan f6b041635e * fix task 49340 2022-02-25 09:47:25 +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
李玉春 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
孙广明 e6338d280e Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.

See merge request easycorp/zentaopms!1936
2022-02-24 02:46:43 +00:00
zhangzilong 861d6d3e47 * Finish task #49280. 2022-02-24 10:44:13 +08:00
zhangzilong a68221ccaf * Finish task #49280. 2022-02-24 10:41:54 +08:00
李玉春 3762eba099 Merge branch 'sprint/185_zhengrunyu_Fixbug_19957' into 'sprint/185'
* Fix bug 19957 .

See merge request easycorp/zentaopms!1939
2022-02-24 02:41:07 +00:00
zhengrunyu 259edbbf3c * Fix bug 19957 . 2022-02-24 10:39:35 +08:00
tanghucheng 57047bb2eb * Finish task #49376,49365,49366. 2022-02-24 09:49:59 +08:00
zhangzilong a9e3772439 * Finish task #49280. 2022-02-24 09:30:52 +08:00
孙广明 b4978c6159 Merge branch 'sprint/185_xieqiyu_19928' into 'sprint/185'
* Fix bug#19928.

See merge request easycorp/zentaopms!1934
2022-02-24 01:08:39 +00:00
xieqiyu 0678ee1fde * Fix bug#19928. 2022-02-24 08:54:08 +08:00
Zongjun Lan 8d397cac21 * Fix bug #49355 2022-02-24 08:53:13 +08:00
李玉春 ed765643ca Merge branch 'sprint/185_zxd_49289' into 'sprint/185'
Sprint/185 zxd 49289

See merge request easycorp/zentaopms!1932
2022-02-24 00:43:31 +00:00
李玉春 a04e4ec1d6 Merge branch 'sprint/185_zxd_49301' into 'sprint/185'
* Finish task #49301.

See merge request easycorp/zentaopms!1931
2022-02-24 00:42:27 +00:00
周旭东 f521758c05 Update control.php 2022-02-24 00:34:56 +00:00
孙广明 bde32fd381 * Refactor code. 2022-02-24 08:19:04 +08:00
李玉春 9b4fe955ea Merge branch 'sprint/185_zhouxudong_19917' into 'sprint/185'
Sprint/185 zhouxudong 19917

See merge request easycorp/zentaopms!1923
2022-02-23 09:26:48 +00:00
李玉春 e30201491d Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1929
2022-02-23 09:26:29 +00:00
周旭东 bc832bcf22 Update kanban.js 2022-02-23 09:20:20 +00:00
孙华伟 e78a9cc05a *Story #30529. 2022-02-23 17:17:28 +08:00
孙华伟 51e54dcf74 *Story #30529. 2022-02-23 17:15:56 +08:00
zhouxudong 6556130370 * Modify variable name. 2022-02-23 17:11:26 +08:00