手动解决合并冲突

core/src/main/java/com/dite/znpt/config/CustomLocalDateTimeDeserializer.java

@@ -10,27 +10,11 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 public class CustomLocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
-    private static final DateTimeFormatter FORMATTER1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-    private static final DateTimeFormatter FORMATTER2 = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
 
     @Override
     public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
         String date = p.getText();
-        if (date == null || date.trim().isEmpty()) {
+        return LocalDateTimeUtil.parse(date, FORMATTER);
-            return null;
-        }
-        
-        try {
-            // 尝试第一种格式 yyyy-MM-dd HH:mm:ss
-            return LocalDateTimeUtil.parse(date, FORMATTER1);
-        } catch (Exception e1) {
-            try {
-                // 尝试第二种格式 yyyy/MM/dd HH:mm
-                return LocalDateTimeUtil.parse(date, FORMATTER2);
-            } catch (Exception e2) {
-                // 如果都失败，尝试自动解析
-                return LocalDateTimeUtil.parse(date);
-            }
-        }
     }
 }

core/src/main/java/com/dite/znpt/domain/vo/EquipmentListReq.java

@@ -97,18 +97,6 @@ public class EquipmentListReq implements Serializable {
     @ApiModelProperty("资产备注")
     private String assetRemark;
 
-    @ApiModelProperty("使用部门/人")
-    private String usingDepartment;
-
-    @ApiModelProperty("发票")
-    private String invoice;
-
-    @ApiModelProperty("条码")
-    private String barcode;
-
-    @ApiModelProperty("导入人")
-    private String importer;
-
     @ApiModelProperty("采购时间开始")
     private LocalDateTime purchaseTimeStart;