Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

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<String> getUrl() {
         String imUrl;

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;
+
 }