Merge branch 'dev' into debug

sp-server/src/main/java/com/pj/project/tb_disinfect/ExportDisnfectDTO.java

@@ -48,7 +48,7 @@ public class ExportDisnfectDTO {
     /**
      * 规格
      */
-    private Double unit;
+    private String unit;
 
     /**
      * 包装

sp-server/src/main/java/com/pj/project/tb_fee_statistics/TbFeeStatisticsService.java

@@ -316,7 +316,11 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
             Integer inNum = inCarList != null ? inCarList.size() : 0;
             Integer outNum = outCarList != null ? outCarList.size() : 0;
             Integer addNum = inNum - outNum;
-            data.setDay(day).setInNum(inNum).setOutNum(outNum).setAddNum(addNum).setDayMoney(statistics.getTaxMoney());
+            data.setDay(day).setInNum(inNum).setOutNum(outNum).setAddNum(addNum);
+            if(data.getDayMoney() == null){
+                data.setDayMoney(BigDecimal.valueOf(0));
+            }
+            data.setDayMoney(data.getDayMoney().add(statistics.getTaxMoney()));
             //dataMap.put(key, data);
             totalIn += inNum;
             totalOut += outNum;