Merge branch 'dev_vaccine_change'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java

@@ -67,12 +67,12 @@ public class AddIcVaccineFormDTO implements Serializable {
     /**
      * 接种地点
      */
-    @NotBlank(message = "接种地点不能为空", groups = Vaccine.class)
+    //@NotBlank(message = "接种地点不能为空", groups = Vaccine.class)
     private String inoculateAddress;
     /**
      * 疫苗厂家
      */
-    @NotBlank(message = "疫苗厂家不能为空", groups = Vaccine.class)
+    //@NotBlank(message = "疫苗厂家不能为空", groups = Vaccine.class)
     private String manufacturer;
     /**
      * 是否客户下居民(0:否  1:是)

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java

@@ -35,11 +35,11 @@ public class IcVaccineImportExcelData implements Serializable {
     @ExcelProperty("接种时间")
     private Date inoculateTime;
 
-    @NotBlank(message = "接种地点为必填项")
+    //@NotBlank(message = "接种地点为必填项")
     @ExcelProperty("接种地点")
     private String inoculateAddress;
 
-    @NotBlank(message = "疫苗厂家为必填项")
+    //@NotBlank(message = "疫苗厂家为必填项")
     @ExcelProperty("疫苗厂家")
     private String manufacturer;
 

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.61__alter_ic_vaccine.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `ic_vaccine`
+MODIFY COLUMN `INOCULATE_ADDRESS`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '接种地点' AFTER `INOCULATE_TIME`,
+MODIFY COLUMN `MANUFACTURER`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '疫苗厂家' AFTER `INOCULATE_ADDRESS`;
+