# Conflicts:
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTask.java
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTaskRegister.java

关闭预付款及结余汇总调度任务

See merge request kunlun/xyst_dinas/xyst_dinas_backend!42

实时销售增加限制条件 limitNum

See merge request kunlun/xyst_dinas/xyst_dinas_backend!41

综合BI新增部分统计查询

See merge request kunlun/xyst_dinas/xyst_dinas_backend!40

Feature/form statistics 05

See merge request kunlun/xyst_dinas/xyst_dinas_backend!39

修改回款明细-退费未完成展示出现的问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!38

列表及条数同意增加状态判断

修改区域公司匹配不到问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!37

回款明细返回 查询条件下总条数。

See merge request kunlun/xyst_dinas/xyst_dinas_backend!36

预付款及结余汇总表导出修复

See merge request kunlun/xyst_dinas/xyst_dinas_backend!35

回款明细增加分页功能，不影响导出功能

See merge request kunlun/xyst_dinas/xyst_dinas_backend!34