111

config/prod.js

@@ -3,15 +3,11 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-<<<<<<< HEAD
     // HOST: '"http://192.168.89.25:9087"',
-=======
-    // HOST: '"http://192.168.89.147:9087"',
->>>>>>> 5ab9f7c14c635202431490cc583c16a77f4f47a2
     HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
-    VERSION: '"1.1.24-20230516"',
+    VERSION: '"1.1.25-20230524"',
   },
   mini: {},
   h5: {