Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/message/ZhaohuiDailyService.java

@@ -166,6 +166,7 @@ public class ZhaohuiDailyService {
        if (padUseTimeList.size()>0) {
            padUseTimeList.get(padUseTimeList.size()-1).get("time");
            zhaohuiDailyEntity.setPadLastTime(padUseTimeList.get(padUseTimeList.size()-1).get("time").toString());
            logger.info("pad最后使用时间:"+padUseTimeList.get(padUseTimeList.size()-1).get("create_time").toString());
            zhaohuiDailyEntity.setPadLastTotalTime(padUseTimeList.get(padUseTimeList.size()-1).get("create_time").toString());
        }else {
            zhaohuiDailyEntity.setPadLastTime("0");