From 8f2f35da0cbb07d8bf0d04468c8a2bdf5ee895e5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 三月 2025 10:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java
index 8b20711..334cfdb 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.api.domain.vo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.GroupStatusEnum;
@@ -13,9 +15,9 @@
@Data
public class WdGoodsGroupPurchaseVO {
- @ApiModelProperty(value = "团购商品id")
- @JsonInclude(JsonInclude.Include.ALWAYS)
- private Long Id;
+ @ApiModelProperty(value = "商品团购id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
@ApiModelProperty(value = "商品id")
@JsonInclude(JsonInclude.Include.ALWAYS)
--
Gitblit v1.7.1