Merge branch 'feature/my-invitation' into preview

Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview
build:依赖工具
2025-01-02 17:16:16 +08:00 · 2025-01-02 17:03:22 +08:00 · 2025-01-02 17:01:52 +08:00
2 changed files with 2 additions and 7 deletions
--- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/MallProduct.java
+++ b/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;
    /**
     * 商品名称
     */
--- a/mcwl-resource/src/main/resources/mapper/resource/MallProductMapper.xml
+++ b/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,
Author	SHA1	Message	Date
yang	efa88e9d7a	Merge branch 'feature/my-invitation' into preview	2025-01-02 17:16:16 +08:00
ChenYan	2ccd2c658a	Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview	2025-01-02 17:03:22 +08:00
ChenYan	4c4f03583a	build:依赖工具	2025-01-02 17:01:52 +08:00