修改我的家族列表

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppFamilyVo.java

@@ -56,4 +56,7 @@ public class AppFamilyVo extends BaseEntity {
 
     @ApiModelProperty(value="创建者")
     private String createName;
+
+    @ApiModelProperty(value="是否默认  Y是  N否")
+    private String acquiesce;
 }

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyMapper.java

@@ -18,6 +18,6 @@ import java.util.List;
 public interface TbFamilyMapper extends BaseMapper<TbFamily> {
 
     List<TbFamily> selectByUserId(@Param("userId") Long uid);
-    List<TbFamily> selectByMemberId(@Param("memberId") Long mid);
+    List<AppFamilyVo> selectByMemberId(@Param("memberId") Long mid);
     List<AppFamilyVo> pageList(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbFamily> wrapper);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyService.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface ITbFamilyService extends IService<TbFamily> {
 
     List<TbFamily> selectByUserId(Long uid);
-    List<TbFamily> selectByMemberId(Long mid);
+    List<AppFamilyVo> selectByMemberId(Long mid);
     List<AppFamilyVo> pageList(LambdaQueryWrapper<TbFamily> wrapper);
     boolean saveFamily(TbFamily family);
     TbFamily myFamily(Long memberId);

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyServiceImpl.java

@@ -52,7 +52,7 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
      * @return
      */
     @Override
-    public List<TbFamily> selectByMemberId(Long mid) {
+    public List<AppFamilyVo> selectByMemberId(Long mid) {
         return baseMapper.selectByMemberId(mid);
     }
 

ruoyi-system/src/main/resources/mapper/app/TbFamilyMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where m.app_user_id = #{userId}
     </select>
     <select id="selectByMemberId" resultType="com.ruoyi.app.domain.vo.AppFamilyVo">
-        select f.id,mi.id middle_id,m.id member_id,
+        select f.id,mi.id middle_id,m.id member_id,mi.acquiesce,
         f.name,f.address,f.contents,f.avatar,f.city,f.code,f.full_name,f.hometown,
         f.create_by,f.create_time,f.update_by,f.update_time,f.remark
         from tb_family f