Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

2023-07-19 16:58:09 +08:00
parent f7fb454481 b1e5bb2aef
commit 29dfd53d4a
5 changed files with 8 additions and 9 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java
@@ -22,7 +22,7 @@ public class HyIntendDevelopementMappingDO implements Serializable {
    private Long id;

    @ApiModelProperty("hy_intend_developement_zone_info.id")
-    private String mappingId;
+    private Long mappingId;

    @ApiModelProperty("hy_open_area_info.id或者区域ID")
    private String openAreaMappingId;