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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 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, Integer status);
    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId,Long director,  String condition, Integer status);

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