1

jyzb-api/pom.xml

@@ -43,10 +43,7 @@
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.junmp.jyzb</groupId>
-            <artifactId>jyzb-biz</artifactId>
-        </dependency>
+
 
     </dependencies>
 </project>

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PolicemanReq.java.orig

-<<<<<<< HEAD
-package com.junmp.jyzb.api.bean.req;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.junmp.v2.common.bean.request.BaseRequest;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PolicemanReq extends BaseRequest {
-
-    @NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
-    private String id;
-
-    @NotNull(message = "警员名字不能为空", groups = {edit.class, delete.class, detail.class})
-    private String name;
-
-    private String cabinetBoxId;
-
-    @NotNull(message = "组织机构不能为空", groups = {edit.class, delete.class, detail.class})
-    private String orgId;
-
-    private Long orgIdInt;
-
-    private Long departmentId;
-
-    private String policeCode;
-
-    private String sex;
-
-    private String faceInfo;
-
-    private Boolean isCreatedAccount;
-
-    private String doorCode;
-
-    private String password;
-
-    private String photo;
-
-    private String phone;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private String idCard;
-
-    private String updateUser;
-
-    private Integer state;
-
-    private static final long serialVersionUID = 1L;
-}
-=======
-package com.junmp.jyzb.api.bean.req;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.junmp.v2.common.bean.request.BaseRequest;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class PolicemanReq extends BaseRequest {
-
-    @NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
-    private String id;
-
-    private String name;
-
-    private String cabinetBoxId;
-
-    private Long orgIdInt;
-
-    private String orgId;
-
-    private Long departmentId;
-
-    private String policeCode;
-
-    private String sex;
-
-    private String faceInfo;
-
-    private Boolean isCreatedAccount;
-
-    private String doorCode;
-
-    private String password;
-
-    private String photo;
-
-    private String phone;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private String idCard;
-
-    private String updateUser;
-
-    private Integer state;
-}
->>>>>>> 2d1905eb57c664c7853f98789c36483e5ba60371