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

LSH

2023-09-14 01c24bd453310f06ee42f71c3c2142fbefccca9b

 src/main/java/com/zy/crm/manager/service/OrderService.java

@@ -14,7 +14,7 @@

    String getUuid(Long hostId);

    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition);
    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status);

    Double selectMoneyByYearAndStatus(String year, Integer status);//获取指定年份和订单状态总交易金额