Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview

mcwl-resource/src/main/java/com/mcwl/resource/domain/MallProduct.java

@@ -28,15 +28,11 @@ public class MallProduct extends BaseEntity {
      * ID
      */
     @TableId
-    private Long Id;
+    private Integer productId;
     /**
      * 用户ID
      */
     private Integer userId;
-    /**
-     * 商品ID
-     */
-    private Integer productId;
     /**
      * 商品名称
      */

mcwl-resource/src/main/resources/mapper/resource/MallProductMapper.xml

@@ -6,9 +6,8 @@
 
 
     <select id="selectMallProductById" resultType="java.lang.String">
-        select id,
+        select product_id,
                user_id,
-               product_id,
                product_name,
                detail,
                model,