Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBusinessBiz.java

@@ -105,7 +105,7 @@ public class UserBusinessBiz {
         promoteBO.setActivatedNumber(memberStateAndCountMap.get(1));
 
         BigDecimal totalIncome = appUserSellingWaterBiz.selectTotalIncomeByUserId(userId);
-        promoteBO.setTotalIncome(totalIncome);
+        promoteBO.setTotalIncome(totalIncome==null?new BigDecimal(0):totalIncome);
         return promoteBO;
     }
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -17,7 +17,7 @@ WHERE
      </foreach>
     </select>
 
-    <select id="selectTotalIncomeByUserId">
+    <select id="selectTotalIncomeByUserId" resultType="java.math.BigDecimal">
         SELECT SUM(commission) FROM app_user_selling_water WHERE `user_id`=#{userId}
     </select>
 </mapper>
\ No newline at end of file