Commit fe91978ff64cd28e0ab0b0118b9bb6e5cee93c3e

Authored by 王彪总
2 parents 28be1737 39676857

Merge remote-tracking branch 'origin/dev' into dev

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/WaterFeeImport.java
... ... @@ -35,7 +35,7 @@ public class WaterFeeImport
35 35 /** 水表编码(String 类型:@NotEmpty+@Pattern 正常) */
36 36 @ExcelProperty(index = 1)
37 37 @NotEmpty(message = "水表编码不能为空")
38   - @Pattern(regexp = "^\d{9}$", message = "水表编码必须由9位数字组成")
  38 + //@Pattern(regexp = "^\d{9}$", message = "水表编码必须由9位数字组成")
39 39 private String meterCode;
40 40  
41 41 /** 水表地址(非必填,无注解冲突) */
... ...