From c38dce7eb2c94df58bee59780fe839eff5976316 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 12 八月 2022 10:12:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
index ce3d55d..48c1ea5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
@@ -13,7 +13,7 @@
/**闂ㄥ簵鏍囪瘑 */
private String shopId;
/**鍥㈣喘鍟嗗搧绫诲瀷鏍囪瘑 */
- private String typeId;
+ private String goodsTypeId;
/**鍥㈣喘娲诲姩鏍囪瘑 */
private String groupBuyId;
--
Gitblit v1.8.0