Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWaterBiz.java

@@ -102,7 +102,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             date = sdf.parse(sdf.format(new Date()));
-            if (time < date.getTime() && time > date.getTime()) {
+            if (time < (date.getTime()+24*3600*1000) && time > date.getTime()) {
                 isToday = true;
             }
         } catch (ParseException e) {
@@ -136,7 +136,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
             }
             log.info("---钱包未入账的处理updMyWalletUnbooked----userId==="+userId+"----unbooked==="+unbooked);
             wallet.setUnbooked(unbooked);
-            mapper.updMyWater(wallet);
+            updateSelectiveById(wallet);
         }
     }