Merge branch 'master' of http://39.105.160.25:10880/wuheng/eas-system

controller/src/main/resources/application.yaml

@@ -36,11 +36,9 @@ eas:
   password-sign-key: eas-key-password
 aj:
   captcha:
-    jigsaw: classpath:images/jigsaw
-    pic-click: classpath:images/pic-click
     cache-type: local
     type: default
-    water-mark: "\u6211\u7684\u6c34\u5370"
+    water-mark: "\u7231\u6263\u9489"
     slip-offset: 5
     aes-status: true
     interference-options: 2