Merge remote-tracking branch 'origin/master'

adc-da-main/src/main/resources/application-dev.properties

@@ -63,8 +63,8 @@ swaggerLevel=0
 
 # \u672C\u5730\u5B58\u50A8\u6587\u4EF6\u7684\u78C1\u76D8\u5730\u5740
 #uploadFile=D:\\work\\idea\\changan\\
-uploadFile=D:\\uploadfile\\tmp\\
-#uploadFile=/data/DeploymentPackage/report_library/uploadfile/
+#uploadFile=D:\\uploadfile\\tmp\\
+uploadFile=/data/DeploymentPackage/report_library/uploadfile/
 # \u672C\u5730\u6587\u4EF6\u8BBF\u95EE\u7684url\u5730\u5740
 picPath=/api/home/pic/
 
@@ -87,7 +87,8 @@ MAIL_POP_PORT=110
 #MAIL_USERNAME=64459@Any3.com
 #MAIL_PASSWORD=65316975Xiaoq
 
-IPANDPORT=http://localhost:7061/
+# \u4FEE\u6539\u6210\u540E\u7AEF\u670D\u52A1\u5668\u5730\u5740
+IPANDPORT=http://localhost:7060/
 
 #redis
 #Redis\u670D\u52A1\u5668\u5730\u5740
@@ -110,7 +111,7 @@ spring.redis.jedis.pool.max-wait=2000ms
 spring.redis.database=2
 
 # \u4E0A\u4F20\u65B9\u5F0F\uFF1A\u963F\u91CC\u4E91\uFF1Aalioss \u534E\u4E3A\u4E91\uFF1Ahwobs \u672C\u5730\uFF1Alocal
-uploadType: local
+uploadType: hwobs
 
 # \u672C\u5730\u6587\u4EF6\u5B58\u50A8\u5730\u5740
 localFilePath=D:\\uploadfile\\

adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -83,6 +83,7 @@
         pa.power
         FROM
         TT_REPORT_MANAGE eo
+        INNER JOIN ts_report_label AS trl ON eo.id = trl.report_id
         LEFT JOIN tr_report_user ru ON eo.id = ru.reportId
         LEFT JOIN power_apply pa ON pa.report_id = eo.id
         WHERE