From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsTagVO.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/CustomerTagVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsTagVO.java
similarity index 60%
copy from framework/src/main/java/cn/lili/modules/lmk/domain/vo/CustomerTagVO.java
copy to framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsTagVO.java
index e0a9236..336360e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/CustomerTagVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/GoodsTagVO.java
@@ -1,16 +1,12 @@
package cn.lili.modules.lmk.domain.vo;
import cn.lili.base.AbsVo;
-
-import java.util.List;
-
-import cn.lili.modules.lmk.domain.entity.CustomerTag;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
+import cn.lili.modules.lmk.domain.entity.MemberTag;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
/**
* 灞曠ず
@@ -20,21 +16,30 @@
*/
@Data
@ApiModel(value = "鍝嶅簲鏁版嵁", description = "鍝嶅簲鏁版嵁")
-public class CustomerTagVO extends AbsVo {
+public class GoodsTagVO extends AbsVo {
- /** */
+ @ApiModelProperty("鏍囩Id")
+ private String tagId;
+
+ @ApiModelProperty("瀹㈡埛id")
+ private String goodsId;
+
+ /**
+ *
+ */
@ApiModelProperty("鏍囩鍚嶇О")
private String tagName;
- /** */
+ /**
+ *
+ */
@ApiModelProperty("鍒涘缓鏂瑰紡")
private String createType;
-
- public static CustomerTagVO getVoByEntity(@NonNull CustomerTag entity, CustomerTagVO vo) {
- if(vo == null) {
- vo = new CustomerTagVO();
+ public static GoodsTagVO getVoByEntity(@NonNull MemberTag entity, GoodsTagVO vo) {
+ if (vo == null) {
+ vo = new GoodsTagVO();
}
BeanUtils.copyProperties(entity, vo);
return vo;
--
Gitblit v1.8.0