Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderLogLogic.java

@@ -133,7 +133,7 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderBase.getAppointmentTime());
             String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
-            pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
+            pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",反馈时间："+DateUtil.format(pgOrderOperatorLog.getFkTime(),"yyyy-MM-dd HH:mm:ss")
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
         }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderLogLogic.java

@@ -158,7 +158,7 @@ public class OrderLogLogic {
             String format = sdf3.format(pgOrderBase.getAppointmentTime());
             String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
-            pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",改约上门时间："+sdf.format(pgOrderOperatorLog.getAppointmentTime())+" "+format+"-"+format1
+            pgOrderOperatorLog.setContent("质量反馈编号："+pgOrderOperatorLog.getZlNumber()+",反馈时间："+DateUtil.format(pgOrderOperatorLog.getFkTime(),"yyyy-MM-dd HH:mm:ss")
                     +"；反馈内容："+pgOrderOperatorLog.getContent());
         }