Merge remote-tracking branch 'origin/main' into main

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductSpuSaveReqVO.java

@@ -134,7 +134,7 @@ public class ProductSpuSaveReqVO {
     private ProductOtherRuleSaveReqVO productOtherRule;
 
     @Schema(description = "游船列表")
-    private List<String> shipIds;
+    private String shipIds;
 
 
 }

ship-module-product/ship-module-product-biz/src/main/resources/mapper/productBase/ProductBaseMapper.xml

@@ -119,6 +119,6 @@
     </select>
 
     <select id="selectShipList" resultType="com.yc.ship.module.product.controller.admin.productBase.vo.ShipRespVO">
-        SELECT id,code,name FROM buss_ship WHERE deleted = 0 and status =1
+        SELECT id,code,name FROM buss_ship WHERE deleted = 0 and status =0
     </select>
 </mapper>