From eb6e29fb33c86f0681e6be0a3f3cd16e2ac9cd69 Mon Sep 17 00:00:00 2001 From: Chopper Date: Sat, 9 Oct 2021 19:20:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?im=E6=8E=A7=E5=88=B6=E5=99=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/controller/common/IMController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/IMController.java b/common-api/src/main/java/cn/lili/controller/common/IMController.java index 1f89b937..0cc2aedd 100644 --- a/common-api/src/main/java/cn/lili/controller/common/IMController.java +++ b/common-api/src/main/java/cn/lili/controller/common/IMController.java @@ -32,7 +32,7 @@ public class IMController { @Autowired private SettingService settingService; - @ApiOperation(value = "获取店铺列表分页") + @ApiOperation(value = "获取IM接口前缀") @GetMapping public ResultMessage getUrl() { String imUrl; From b90ee161b525be31a62231d6541ecd4f1cc50e11 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 11 Oct 2021 10:23:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20udesk=20im=E9=9B=86=E6=88=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=BA=97=E9=93=BA=E8=8E=B7=E5=8F=96im?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E6=9C=AA=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java index 26b76abb..46e10907 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java @@ -55,4 +55,7 @@ public class StoreBasicInfoVO { @ApiModelProperty(value = "腾讯云智服小程序唯一标识") private String yzfMpSign; + @ApiModelProperty(value = "udesk标识") + private String merchantEuid; + }