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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java

@@ -141,8 +141,10 @@
    }

    public Long getCstmrId$(){
        PlanService planService = SpringUtils.getBean(PlanService.class);
        Plan plan = planService.selectById(this.itemId);
        CstmrService cstmrService = SpringUtils.getBean(CstmrService.class);
        Cstmr cstmr = cstmrService.selectByName(1L, this.templateName);
        Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
        if (!Cools.isEmpty(cstmr)){
            return cstmr.getId();
        }