Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-admin-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-gateway/src/main/resources/bootstrap.yml

@@ -11,7 +11,7 @@ spring:
     name: epmet-gateway-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: data-report-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml

@@ -8,7 +8,7 @@ spring:
     name: epmet-activiti-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: common-service-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     allow-bean-definition-overriding: true
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-ext-server
   # dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-message-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-oss-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java

@@ -260,7 +260,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam) {
-        ResiPointDetailResultDTO result = baseDao.selectPointByUserId(customerUserParam.getUserId());
+        ResiPointDetailResultDTO result = baseDao.selectPointByCustomerUserId(customerUserParam.getUserId(),customerUserParam.getCustomerId());
         if(null == result) return new ResiPointDetailResultDTO();
         if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
         return result;

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-third-server
   # dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-access-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-grid-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-issue-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-mine-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-org-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-project-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: gov-voice-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: oper-access-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: oper-crm-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: oper-customize-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-group-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-guide-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-hall-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-home-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-mine-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-partymember-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common

epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: resi-voice-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss

epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-openapi-scan
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ spring:
     name: epmet-user-server
   #环境 dev|test|prod
   profiles:
-    active: dev
+    active:  @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages_common