双十二

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -287,8 +287,6 @@ public class ApparatusHandler {
             return new ResultMsg(false, ResultInfo.ERRORCODE, "删除失败，牙刷编号为空",null);
         }
         Integer flag = apparatusService.delTooth(code);
-
-//      SSD0315A180900084
         return new ResultMsg(false, ResultInfo.ERRORCODE, "会员注册失败，请重新注册!",null);
     }
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/utils/ActivityUtil.java

@@ -30,9 +30,9 @@ public class ActivityUtil {
         try {
             switch (type){
                 case 1:
-                    String begin = systemService.selectOneShopRuleById(260).getRuleDesc();
+                    String begin = systemService.selectOneShopRuleByIdDynamic(260).getRuleDesc();
                     activityDate.setBeginDate(sd.parse(begin)); ;
-                    String end = systemService.selectOneShopRuleById(261).getRuleDesc();
+                    String end = systemService.selectOneShopRuleByIdDynamic(261).getRuleDesc();
                     activityDate.setEndDate(sd.parse(end));
                     break;
                 default: