Merge branch 'beta' into beta-prop-all

jianshui-admin/src/main/resources/application-dev.yml

@@ -101,4 +101,9 @@ ele_url_v6: http://192.168.3.60:18108/order-api
 ele_url: http://140.143.226.17:8087/order-api
 #logstash:
 #  host: 43.138.58.64:14560
-#  indexname: jianshui-dev
+#  indexname: jianshui-dev
+invoice:
+  file:
+    save:
+      # 文件上传方式 0:数据库 1:oss 2:本地
+      type: 1

jianshui-admin/src/main/resources/application-prod.yml

@@ -91,4 +91,9 @@ ele_url_v6: https://js.ele12.com/order-api
 ele_url: http://140.143.226.17:8087/order-api
 #logstash:
 #  host: 43.138.58.64:14560
-#  indexname: jianshui-prod
+#  indexname: jianshui-prod
+invoice:
+  file:
+    save:
+      # 文件上传方式 0:数据库 1:oss 2:本地
+      type: 1

jianshui-admin/src/main/resources/application.yml

@@ -119,8 +119,3 @@ srm:
   # basic的账户密码
   username: rendertopod
   pwd: renderpod!2
-invoice:
-  file:
-    save:
-      # 文件上传方式 0:数据库 1:oss 2:本地
-      type: 1