Merge remote-tracking branch 'origin/develop' into develop

src/main/java/org/rcisoft/business/overview/dao/EnergyPriceRepository.java

@@ -23,7 +23,7 @@ public interface EnergyPriceRepository extends BaseMapper<EnergyPriceVo> {
      * @return
      */
     @Select("<script>select e.P_HOUR,SUM(IF(e.P_TP=1, e.P_PRICE, 0)) as WATER,SUM(IF(e.P_TP=2, e.P_PRICE, 0)) as ELEC,SUM(IF(e.P_TP=3, e.P_PRICE, 0)) as GAS from energy_price e where e.PRO_ID=#{proId} and e.P_HOUR=#{pHour}</script>")
-    @ResultMap("vo")
+    @ResultMap("BaseResultMap")
     EnergyPriceVo getPrice(@Param("proId") String proId,@Param("pHour") String pHour);
 
     /**

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://139.199.98.105:3336/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+  url: jdbc:mysql://127.0.0.1:3336/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   username: root
   password: root
   initial-size: 1