master：档口商品列表返回值 增加字段；

xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java

@@ -39,6 +39,10 @@ public class StoreProdPageResDTO {
     private Long prodCateId;
     @ApiModelProperty(value = "分类类目")
     private String prodCateName;
+    @ApiModelProperty(value = "鞋面材质（靴筒面材质）")
+    private String shaftMaterial;
+    @ApiModelProperty(value = "鞋面内里材质")
+    private String shoeUpperLiningMaterial;
     @ApiModelProperty(value = "标准尺码")
     private String standard;
     @ApiModelProperty(value = "销售金额（元）")

xkt/src/main/resources/mapper/StoreProductColorMapper.xml

@@ -34,11 +34,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             spc.prod_status,
             spc.create_time,
             sf.file_url AS mainPicUrl,
-            sp.private_item
+            sp.private_item,
+            spca.shaft_material,
+            spca.shoe_upper_lining_material
         FROM
             store_product_color spc
                 JOIN store_product sp ON spc.store_prod_id = sp.id
                 JOIN sys_product_category pc ON sp.prod_cate_id = pc.id
+                JOIN store_product_category_attribute spca ON spc.store_prod_id = spca.store_prod_id AND spca.del_flag = 0
                 LEFT JOIN store_product_file spf ON sp.id = spf.store_prod_id AND spf.file_type = 1 AND spf.order_num = 1 AND spf.del_flag = 0
                 LEFT JOIN sys_file sf ON spf.file_id = sf.id
         WHERE