Merge branch 'dev' of git.1000my.com:huangmh/base_qmgo_react into dev

.drone.yml

@@ -43,20 +43,20 @@ steps:
         from_secret: gitea_username
       git_password:
         from_secret: gitea_password
-  - name: test分支获取master信息
-    image: alpine/git:v2.36.2
-    commands:
-      - git fetch origin test
-      - git checkout test
-      - git merge origin/master
-      - git commit --amend -m "[skip ci]从master合并历史到test"
-      - git branch --set-upstream-to=origin/test test
-      - git pull
-      - git push --set-upstream origin test
-      - git checkout master
-    when:
-      branch:
-        - master
+  # - name: test分支获取master信息
+  #   image: alpine/git:v2.36.2
+  #   commands:
+  #     - git fetch origin test
+  #     - git checkout test
+  #     - git merge origin/master
+  #     - git commit --amend -m "[skip ci]从master合并历史到test"
+  #     - git branch --set-upstream-to=origin/test test
+  #     - git pull
+  #     - git push --set-upstream origin test
+  #     - git checkout master
+  #   when:
+  #     branch:
+  #       - master
   - name: 获取tag数据
     image: alpine/git:v2.36.2
     environment: