Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -361,6 +361,12 @@ public class WaterResourceDto extends BaseDto {
 	@ExcelProperty(value = "纬度", index = 41)
 	private Double latitude;
 
+	@ExcelProperty(value = "消火栓类型", index =42)
+	@ExplicitConstraint(type = "HSLX",indexNum = 42, sourceClass = CommonExplicitConstraint.class)
+	@ApiModelProperty(value = "消火栓类型")
+	@TableField(exist = false)
+	private String hydrantType;
+
 	@ExcelIgnore
 	@ApiModelProperty(value = "附件")
 	@TableField(exist = false)

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -967,6 +967,9 @@ public class ExcelServiceImpl {
 				item.setResourceTypeName(resourceTypeName[0]);
 				item.setResourceType(resourceTypeName[1]);
 			}
+			if (item.getHydrantType() != null) {
+				item.setType(item.getHydrantType());
+			}
 			if (item.getSystemType() != null) {
 				String[] systemType = item.getSystemType().split("@");
 				item.setSystemType(systemType[0]);