Merge branch 'master' into dev

# Conflicts:
#	admin/src/main/resources/application-dev.yml

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

@@ -9,7 +9,7 @@ ximai-mes:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ximai/uploadPath，Linux配置 /home/ximai/uploadPath）
-  profile: D:/code/upload
+  profile: E:/code/upload
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -56,7 +56,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3308/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: 123456
       # 从库数据源

mes/pom.xml

@@ -19,12 +19,14 @@
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
             <artifactId>jasperreports</artifactId>
-            <version>6.18.1</version>
+            <version>6.21.5</version>
+<!--            <version>6.18.1</version>-->
         </dependency>
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
             <artifactId>jasperreports-fonts</artifactId>
-            <version>6.18.1</version>
+            <version>6.21.5</version>
+<!--            <version>6.18.1</version>-->
         </dependency>
         <!--PDF生成组件-->
         <dependency>