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

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

 src/main/java/com/zy/crm/manager/controller/PriSalesController.java

@@ -152,7 +152,7 @@
        initNames.add("提交产品费用明细");
        initNames.add("部门经理审核");
        initNames.add("业务员确认");
        priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
        priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),getUser(),initNames,3)));

        //设置项目流程
        plan.setStep(3);