ccj 2 年之前
父節點
當前提交
7f526446e4

+ 4 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -269,14 +269,14 @@ public class OrderInfo extends BaseModel<OrderInfo> {
     /**
      * 运输开始日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date tranStartDate;
     /**
      * 运输结束日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date tranEndDate;
     /**
      * 联络人姓名

+ 1 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -619,6 +619,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         if("999999".equals(commonUser.getPassword())){
             CommonUser tmp = new CommonUser();
             tmp.setPhone(commonUser.getPhone());
+            tmp.setIdentification(commonUser.getIdentification());
             tmp.setDeleteFlag("0");
             tmp = commonUserMapper.selectOne(tmp);
             if (!StringUtils.isEmpty(tmp)) {