Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

.gitlab-ci.yml

@@ -61,7 +61,7 @@ push:
   - 'git pull origin map'
   #- 'git rm -rf "${TARGET_REPO}/civbase"'
   #- 'git commit -m "chore: clear folder"'
-  - 'git push origin map'
+  #- 'git push origin map'
   - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civbase" "${TARGET_REPO}/civbase" /S ;
         IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
   - 'git add . ; git reset HEAD Web.config CityInterface/Web.config CityWebFW/Web.config ; git commit -m "auto package civbase."'