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

Junjie

2023-08-24 e4f82a68cdc10967abf0b69d9846721fdca2b77a

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

@@ -30,6 +30,16 @@
        return R.ok(planTypeService.selectById(String.valueOf(id)));
    }

    @GetMapping(value = "/planType/{id}/plan/auth")
    @ManagerAuth
    public R getPlanTypeOfAdd(@PathVariable("id") String id) {
        return R.ok().add(Cools
                .add("planType", planTypeService.selectById(String.valueOf(id)))
                .add("userId", getUserId())
                .add("nickName", getUser().getNickname())
        );
    }

    @PostMapping(value = "/planType/list/auth")
    public R list() {
        return R.ok().add(planTypeService.selectList(new EntityWrapper<PlanType>().orderBy("id")));