Merge remote-tracking branch 'origin/20210223' into 20210223

sms_water/src/main/java/com/huaxu/controller/AppPageReportController.java

@@ -371,7 +371,7 @@ public class AppPageReportController {
 
         List<Map<String,Object>> amount = appPageReportService.findSceneAmount(companyOrgId,1);
         Map<String,Object> map = new HashMap<String,Object>();
-        map.put("amount","-");
+        map.put("amount","0");
         map.put("sceneTypeName","大用户表");
         amount.add(map);
         return new AjaxMessage<>(ResultStatus.OK,amount);