master：商品颜色模糊查询接口返回值调整；

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorResVO.java

@@ -33,5 +33,9 @@ public class StoreProdColorResVO {
     private BigDecimal producePrice;
     @ApiModelProperty(value = "排序")
     private Integer orderNum;
+    @ApiModelProperty(value = "鞋面材质（靴筒面材质）")
+    private String shaftMaterial;
+    @ApiModelProperty(value = "鞋面内里材质")
+    private String shoeUpperLiningMaterial;
 
 }

xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColor/StoreProdColorResDTO.java

@@ -33,5 +33,9 @@ public class StoreProdColorResDTO {
     private BigDecimal producePrice;
     @ApiModelProperty(value = "排序")
     private Integer orderNum;
+    @ApiModelProperty(value = "鞋面材质（靴筒面材质）")
+    private String shaftMaterial;
+    @ApiModelProperty(value = "鞋面内里材质")
+    private String shoeUpperLiningMaterial;
 
 }

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

@@ -65,9 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sp.prod_art_num AS prodArtNum,
             spc.color_name AS colorName,
             sp.produce_price AS producePrice,
-            spc.order_num AS orderNum
+            spc.order_num AS orderNum,
+            spca.shaft_material,
+            spca.shoe_upper_lining_material
         FROM
-            store_product_color spc JOIN store_product sp ON spc.store_prod_id = sp.id
+            store_product_color spc
+            JOIN store_product sp ON spc.store_prod_id = sp.id
+            JOIN store_product_category_attribute spca ON spc.store_prod_id = spca.store_prod_id
         WHERE
             spc.del_flag = 0
             AND spc.store_id = #{storeId}