Merge branch 'master' of http://192.168.168.218/wcyuee/szpt

# Conflicts:
#	src/test/java/com/zksy/szpt/MainTest.java

src/main/java/com/zksy/szpt/domain/dto/SzptGdRyxxDTO.java

@@ -13,13 +13,6 @@ import java.util.Date;
 
 public class SzptGdRyxxDTO {
 
-
-
-    /**
-     * 人员ID
-     */
-    @NotBlank(message = "人员ID不能为空")
-    private String id;
     /**
      * 人口编码
      */
@@ -247,15 +240,6 @@ public class SzptGdRyxxDTO {
      */
     private String sjrzrs;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-
     public String getRkbm() {
         return rkbm;
     }

src/main/java/com/zksy/szpt/domain/dto/SzptGdSbxxDTO.java

 package com.zksy.szpt.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,12 +8,6 @@ import java.util.Date;
 
 public class SzptGdSbxxDTO {
 
-
-    /**
-     * 设备ID
-     */
-    @NotBlank(message = "设备ID不能为空")
-    private String id;
     /**
      * 设备序列号
      */
@@ -135,15 +127,6 @@ public class SzptGdSbxxDTO {
     @NotBlank(message = "登记公安机关名称不能为空")
     private String createGajgmc;
 
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
     public String getSbsn() {
         return sbsn;
     }

src/main/java/com/zksy/szpt/domain/dto/SzptQyxxDTO.java

 package com.zksy.szpt.domain.dto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 public class SzptQyxxDTO {
 
+    /**
+     * 区域ID
+     */
+    @NotBlank(message = "区域ID不能为空")
+    private String id;
     /**
      * 场所ID
      */
@@ -99,6 +107,14 @@ public class SzptQyxxDTO {
     @NotBlank(message = "登记公安机关名称不能为空")
     private String createGajgmc;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getCsid() {
         return csid;
     }

src/main/java/com/zksy/szpt/domain/dto/SzptXyzhKqmbDTO.java

@@ -3,6 +3,12 @@ package com.zksy.szpt.domain.dto;
 import javax.validation.constraints.NotBlank;
 
 public class SzptXyzhKqmbDTO {
+    /**
+     * 模板id
+     */
+    @NotBlank(message = "模板id不能为空")
+    private String id;
+
     /**
      * 模板名称
      */
@@ -15,6 +21,13 @@ public class SzptXyzhKqmbDTO {
     @NotBlank(message = "状态不能为空")
     private String zt;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
     public String getMbmc() {
         return mbmc;
     }

src/main/java/com/zksy/szpt/domain/dto/SzptXyzhMbdhDTO.java

@@ -6,6 +6,13 @@ import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 public class SzptXyzhMbdhDTO {
+
+    /**
+     * 模板itemid
+     */
+    @NotBlank(message = "模板itemid不能为空")
+    private String id;
+
     /**
      * 模板id
      */
@@ -85,6 +92,14 @@ public class SzptXyzhMbdhDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date gxsj;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getMbid() {
         return mbid;
     }

src/main/java/com/zksy/szpt/domain/dto/SzptXyzhXyxxDTO.java

 package com.zksy.szpt.domain.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 public class SzptXyzhXyxxDTO {
+    /**
+     *
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
 
     /**
      * 学校名称
@@ -68,6 +73,13 @@ public class SzptXyzhXyxxDTO {
      */
     private String qrcode;
 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
 
     public String getMc() {
         return mc;

src/main/java/com/zksy/szpt/domain/po/SzptGdRyxx.java

@@ -15,7 +15,7 @@ public class SzptGdRyxx {
     /**
      * 人员ID
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

src/main/java/com/zksy/szpt/domain/po/SzptXyzhXyxx.java

@@ -9,7 +9,7 @@ public class SzptXyzhXyxx {
     /**
      * 
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.INPUT)
     private Integer id;
 
     /**