Merge branch 'zyj-fixbug1022884' into 'master'

fixbug1022884

See merge request rays/pcloud-book!676

pcloud-service-book/src/main/java/com/pcloud/book/push/biz/impl/SelfPushBizImpl.java

@@ -721,12 +721,12 @@ public class SelfPushBizImpl implements SelfPushBiz {
         for (SelfPushRecordDTO dto:recordList) {
             String realSendTime="";
             if(dto.getPushType()!=null&&dto.getPushType()==1){
-                realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+";";
-                realSendTime=realSendTime+"每天;"+dto.getPushSendTime();
+                realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+"；";
+                realSendTime=realSendTime+"每天；"+dto.getPushSendTime();
                 dto.setRealSendTime(realSendTime);
             }else if(dto.getPushType()!=null&&dto.getPushType()==2){
                 String weekDays = dto.getWeekDays();
-                realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+";";
+                realSendTime=DateUtils.formatDate(dto.getStartTime(),"yyyy-MM-dd")+"至"+DateUtils.formatDate(dto.getEndTime(),"yyyy-MM-dd")+"；";
                 if(weekDays.contains("1")){
                     weekDays= weekDays.replace("1","周一");
                 }
@@ -749,7 +749,7 @@ public class SelfPushBizImpl implements SelfPushBiz {
                     weekDays= weekDays.replace("7","周日");
                 }
 
-                realSendTime=realSendTime+weekDays+";"+dto.getPushSendTime();
+                realSendTime=realSendTime+weekDays+"；"+dto.getPushSendTime();
                 dto.setRealSendTime(realSendTime);
             }else{
                 if (null!=dto.getSendTime()){