Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/hisStore/config/MedicalMallConfig.java

@@ -28,6 +28,8 @@ public class MedicalMallConfig {
     private boolean isAudit;
     // 资源配置
     private boolean isResource;
+    // 多店铺
+    private boolean isStores;
     @PostConstruct
     public void init() {
         JSONObject jsonObject = configUtil.generateConfigByKey("medicalMall.func.switch");
@@ -36,6 +38,7 @@ public class MedicalMallConfig {
             this.isStatics = Objects.equals(jsonObject.getString("statics"), "1");
             this.isAudit = Objects.equals(jsonObject.getString("isAudit"), "1");
             this.isResource = Objects.equals(jsonObject.getString("isResource"), "1");
+            this.isStores = Objects.equals(jsonObject.getString("isStores"), "1");
         }
     }
 

fs-service/src/main/resources/application-config-druid-jnlzjk.yml

@@ -83,8 +83,8 @@ headerImg:
   imgUrl:
 
 ipad:
-  ipadUrl: http://ipad.cdwjyyh.com
-  aiApi: 1212121212
+  ipadUrl: http://ipad.ljhehualu.com
+  aiApi: http://49.232.181.28:3000/
 
 wx_miniapp_temp:
   pay_order_temp_id: