ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

Browse Source
This commit is contained in:
furongxin 2024-12-04 11:51:40 +08:00
commit 9b61650fef
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/auth/dto/AdminOauthUserOtherInfoApiDTO.java
View File

@ -12,7 +12,7 @@ public class AdminOauthUserOtherInfoApiDTO {
/** /**
* 社交平台的类型 (参见 {@link SocialTypeEnum} 枚举) * 社交平台的类型 (参见 {@link SocialTypeEnum} 枚举)
*/ */
private Integer socialType = SocialTypeEnum.WECHAT_MINI_APP.getType(); private Integer socialType;
/** /**
* 用户状态 0开启 1关闭 * 用户状态 0开启 1关闭
*/ */

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.system.api.subscribe; package cn.iocoder.yudao.module.system.api.subscribe;
import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
import cn.iocoder.yudao.framework.common.enums.SocialTypeEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.template.vo.MsgData; import cn.iocoder.yudao.framework.common.template.vo.MsgData;
import cn.iocoder.yudao.framework.common.template.vo.SubscribeMessageReqDTO; import cn.iocoder.yudao.framework.common.template.vo.SubscribeMessageReqDTO;
@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;