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

liyj

2024-10-14 94dae325bbe4e23d1a5ebc08788b7d5a7e39a029

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoledataWebController.java

@@ -63,7 +63,7 @@
        if (StringUtils.isNotBlank(unitId)){
            terms.put("unitId", unitId);
        }
        // 删除状态，0：已删除，1：未删除
        // 删除状态，0：未删除，1：已删除
        String deleteStatus = request.getParameter("deleteStatus");
        if (StringUtils.isNotBlank(deleteStatus)){
            terms.put("deleteStatus", deleteStatus);