Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/common/infrastructure/aspect/ServiceAspect.java

@@ -56,8 +56,7 @@ public class ServiceAspect implements HandlerInterceptor {
      */
     @Pointcut("execution(* com.*.*.service..*.*(..)) || execution(* com.dk.*.service..*.*(..)) ||" +
             "execution(* com.dk.*.infrastructure.strategy.ProductionContext.*(..)) ||" +
-            "execution(* com.dk.*.infrastructure.strategy.production.ProductionContext.*(..))"
-    )
+            "execution(* com.dk.*.infrastructure.strategy.production.ProductionContext.*(..))")
     public void print() {
     }
 

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -134,7 +134,7 @@ public enum ErrorCodeEnum {
     INTEGRAL_TACTIC_EXIST(11133, "积分策略不存在!"),
     HERE_ARE_NO_MORE_SHAREABLE_TIMES_ON_THAT_DAY(11134, "当日已无可分享次数!"),
     USER_POWER_OWN(11135, "您不可以为自己助力!"),
-
+    INTEGRAL_MAX(11136, "积分不足，不允许进行该操作!"),
 
     CUSTOMER_FOLLOW_NEXT_TIME_OVER(8004, "当前时间已超过选择的提醒时间"),
     CUSTOMER_FOLLOW_NEXT_TIME_NULL(8006, "未选择提醒时间"),