Merge remote-tracking branch 'origin/master'

# Conflicts: # out/production/resources/AccessInterface.yml # out/production/resources/application.properties
9 months ago · 1753dbe90c
2 changed files with 2 additions and 2 deletions
--- a/out/production/resources/application.properties
+++ b/out/production/resources/application.properties
@ -68,6 +68,7 @@ db.default.url=jdbc:mysql://117.78.10.170:3006/app_zhangqiyang_app_master_pre?us
 db.default.user=app_zhangqiyang
 db.default.password=Asdf123!@#

+
 #db.company1.name=Company 1
 #db.company1.driver=com.mysql.cj.jdbc.Driver
 #db.company1.url=jdbc:mysql://localhost:3306/hy_iot_paas2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
@ -389,6 +390,5 @@ logging.level.com.hypaas=INFO



-