Merge remote-tracking branch 'origin/master'

twzd-service/src/main/java/com/miaxis/extension/vo/ExtensionIncomeVo.java

@@ -15,6 +15,11 @@ import lombok.Data;
 @ApiModel(value = "ExtensionIncomeVo", description = "分成收益对象返回参")
 public class ExtensionIncomeVo {
 
+    @TableField("id")
+    @ApiModelProperty(value = "用户id")
+    private Integer id;
+
+
     @TableField("openid")
     @ApiModelProperty(value = "微信openid")
     private String openid;

twzd-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where openid = (select parent_openid from wx_spread_relation where openid = #{fromUserName})
     </select>
     <select id="getDownLevelPoints"  resultType="com.miaxis.extension.vo.ExtensionIncomeVo">
-        select openid,IFNULL(nick_name,'未知') as nick_name,IFNULL(head_image,'未知') as head_image,achievement,achievement_settled,
+        select id,openid,IFNULL(nick_name,'未知') as nick_name,IFNULL(head_image,'未知') as head_image,achievement,achievement_settled,
         (select count(1) from wx_spread_relation where parent_openid =t1.openid) as extension_count from user_info t1
         where openid in (select openid from wx_spread_relation where parent_openid = #{openid})
     </select>