Merge branch 'dev' into test

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java

api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java

@@ -47,6 +47,17 @@ public enum BasicExportTypeEnum {
      */
     ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
 
+    /**
+     * 单据信息
+     */
+//    IO_ORDER("io_order", "单据信息"),
+
+
+    /**
+     * 发票信息
+     */
+//    ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
+
     /**
      * 单据信息
      */

api-admin/src/main/resources/application-pro.properties

@@ -16,8 +16,8 @@ cors.allowed-Credentials=true
 server.tomcat.max-http-form-post-size=100MB
 server.max-http-header-size=100MB
 #\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB)
-spring.servlet.multipart.max-file-size=104857600
-spring.servlet.multipart.max-request-size=104857600
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
 server.connectionTimeout=180000
 #logging.level.com.glxp.sale.admin.dao=debug
 # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002

api-admin/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=test
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml