Merge remote-tracking branch 'origin/master'

yt-app/app-service/src/main/java/com/ytpm/controller/UserController.java

@@ -62,11 +62,10 @@ public class UserController {
             if (userAdMap.containsKey(user.getUserId())) {
                 List<YtDyzAdRecord> ytDyzAdRecords = userAdMap.get(user.getUserId());
                 BigDecimal todayIncome = calculateTodayIncome(ytDyzAdRecords);
-                user.setTotalIncome(todayIncome);
+                user.setTodayIncome(todayIncome);
             } else {
                 user.setTodayIncome(BigDecimal.ZERO);
             }
-
         }
         return ResultTable.resultTableOk(new PageInfo<YtDyzUser>(dyzUsers));
     }

yt-common/src/main/java/com/ytpm/app/view/YtAppUserListView.java

@@ -78,4 +78,6 @@ public class YtAppUserListView {
     private Integer deviceRepeatCount;
     @ApiModelProperty("通信运营商")
     private String communicationOperator;
+    @ApiModelProperty("今日收益")
+    private BigDecimal todayIncome;
 }