Commit 9bca84553a0f7aadc05fefa05c0af6c5029b88be
Merge remote-tracking branch 'origin/dev' into dev
Showing
2 changed files
with
2 additions
and
2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
| @@ -60,7 +60,7 @@ public class InspectionPlanCommitRespVO { | @@ -60,7 +60,7 @@ public class InspectionPlanCommitRespVO { | ||
| 60 | @Schema(description = "巡检照片") | 60 | @Schema(description = "巡检照片") |
| 61 | @ExcelProperty("巡检照片") | 61 | @ExcelProperty("巡检照片") |
| 62 | @TableField(typeHandler = StringListTypeHandler.class) | 62 | @TableField(typeHandler = StringListTypeHandler.class) |
| 63 | - private List<String> imgList; | 63 | + private List<String> img; |
| 64 | 64 | ||
| 65 | @Schema(description = "巡检结果: 1:正常;2:异常") | 65 | @Schema(description = "巡检结果: 1:正常;2:异常") |
| 66 | @ExcelProperty("巡检结果: 1:正常;2:异常") | 66 | @ExcelProperty("巡检结果: 1:正常;2:异常") |
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO"> | 6 | <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO"> |
| 7 | - <result property="imgList" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/> | 7 | + <result property="img" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/> |
| 8 | </resultMap> | 8 | </resultMap> |
| 9 | <!-- | 9 | <!-- |
| 10 | 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 | 10 | 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 |