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

Junjie

2023-11-10 578c84810e978be343ef93f214da91c27917eef1

 src/main/java/com/zy/crm/system/entity/User.java

@@ -264,6 +264,4 @@
    public void setStatus(Integer status) {
        this.status = status;
    }


}