Merge branch 'dev-fix/#11' of…

Merge branch 'dev-fix/#11' of git.allhome.com.cn:QJMIS-CPD/CPD_company_site/web_company_site into dev-fix/#11

.gitlab-ci.yml

@@ -58,15 +58,9 @@ build_push_image_pred:
 remote_run_image_dev:
     stage: deploy
     script:
-<<<<<<< HEAD
-      - bash ~/.local/bin/f200.sh   $CONTAINER_NAME    7084 80   $DEV_REPO:$CONTAINER_NAME  guojia   192.168.10.200
-    tags:
-      - shell-200
-=======
       - bash ~/.local/bin/f200.sh $CONTAINER_NAME  8066 80  $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
     tags:
         - shell-200
->>>>>>> 6aaa93d5bffd52579c8177bf216a345ea00d2eab
     only:
       - dev 
     when: on_success
@@ -75,11 +69,7 @@ remote_run_image_pred:
     stage: deploy
   
     script:
-<<<<<<< HEAD
-      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  7084 80  $PRED_REPO:$CONTAINER_NAME zp  39.106.144.161
-=======
       - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  8066  80  $PROD_REPO:$CONTAINER_NAME   zp 39.106.144.161
->>>>>>> 6aaa93d5bffd52579c8177bf216a345ea00d2eab
     tags:
         - shell-prod 
     only: