11111

yiqi-common/src/main/java/com/yiqi/activity/domain/vo/ActivityClothItemVO.java

@@ -25,7 +25,7 @@ public class ActivityClothItemVO extends BaseEntity
     /** 主键ID */
     @ApiModelProperty("主键ID")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
+    private Long clothId;
 
     /** 衣服ID */
     @Excel(name = "衣服名称")

yiqi-core/src/main/resources/mapper/activity/ActivityClothItemMapper.xml

@@ -25,7 +25,7 @@
     </sql>
 
     <select id="selectActivityClothItemList" parameterType="ActivityClothItem" resultType="com.yiqi.activity.domain.vo.ActivityClothItemVO">
-        select ac.id, ac.cloth_item_id, ac.discount, c.name as cloth_item_name, ac.price, ac.wash_mode_ids,
+        select c.id as clothId, ac.cloth_item_id, ac.discount, c.name as cloth_item_name, ac.price, ac.wash_mode_ids,
         ac.create_by_id, ac.create_by, ac.create_time
         , ac.update_by_id, ac.update_by, ac.update_time, ac.remark
         from activity_cloth_item as ac