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

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

@@ -389,7 +389,7 @@ public class OrderLogLogic {
 
             //公众号通知
             wxPubNoticeLogic.addDispatch(pgOrderWorker.getWorkerMobile(),pgOrderBase.getCompanyWechatId(),pgOrderBase.getOrderTypeText(),
-                    pgOrderBase.getId(),pgOrderBase.getDispatchTime(), text,
+                    pgOrderBase.getId(),new Date(), text,
                     StringUtils.isBlank(pgOrderBase.getAddress())?pgOrderBase.getGpsAddress():pgOrderBase.getAddress());
         }