From efc09045da6ca5fc06ff9221723ed9ddf81e568e Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期三, 09 八月 2023 09:32:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java index 96daacd..1478c3d 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java +++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java @@ -22,7 +22,7 @@ */ private Long id; /** - * 优惠券id + * 商品id */ private Integer pointsMerchandiseId; /** -- Gitblit v1.7.1