Merge remote-tracking branch 'origin/master'

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallAddOneRequestDTO.java

@@ -39,13 +39,13 @@ public class ServiceHallAddOneRequestDTO extends AbstractStaffBizRequestDTO {
     private String tel;//手机号
     @NotBlank(message = "地址不能为空")
     private String address;//地址
-    @NotNull
+//    @NotNull
     @ApiModelProperty(value = "经度")
     private Double longitude;//经度
-    @NotNull
+//    @NotNull
     @ApiModelProperty(value = "纬度")
     private Double latitude;//纬度
-    @NotNull
+//    @NotNull
     @ApiModelProperty(value = "半径距离")
     private Integer radial;//半径距离
     // 位置信息

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallUpdateRequestDTO.java

@@ -28,13 +28,13 @@ public class ServiceHallUpdateRequestDTO extends AbstractStaffBizRequestDTO {
     private String tel;//手机号
     @NotBlank(message = "地址不能为空")
     private String address;//地址
-    @NotNull
+//    @NotNull
     @ApiModelProperty(value = "经度")
     private Double longitude;//经度
-    @NotNull
+//    @NotNull
     @ApiModelProperty(value = "纬度")
     private Double latitude;//纬度
-    @NotNull
+//    @NotNull
     @ApiModelProperty(value = "半径距离")
     private Integer radial;//半径距离
     @NotBlank(message = "渠道编号")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/excel/listener/ServiceHallRegisterFullBatchListener.java

@@ -45,9 +45,9 @@ public class ServiceHallRegisterFullBatchListener implements ReadListener<Servic
         if (StringTools.isEmpty(data.getAddress())) builder.append("地址不能为空").append(",");
         if (StringTools.isEmpty(data.getContact())) builder.append("联系人不能为空").append(",");
         if (StringTools.isEmpty(data.getTel())) builder.append("电话不能为空").append(",");
-        if (StringTools.isEmpty(data.getLongitude())) builder.append("经度不能为空").append(",");
-        if (StringTools.isEmpty(data.getLatitude())) builder.append("纬度不能为空").append(",");
-        if (StringTools.isEmpty(data.getRadial())) builder.append("半径距（米）不能为空").append(",");
+//        if (StringTools.isEmpty(data.getLongitude())) builder.append("经度不能为空").append(",");
+//        if (StringTools.isEmpty(data.getLatitude())) builder.append("纬度不能为空").append(",");
+//        if (StringTools.isEmpty(data.getRadial())) builder.append("半径距（米）不能为空").append(",");
         if (StringTools.isEmpty(data.getMapChannelId())) {
             builder.append("中心网点编号不为空").append(",");
         } else {