Merge branch 'master' into dev

zss

2024-11-26 af430e03b2f1a1db9369b17a96896dcec9217919

 user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java

@@ -64,5 +64,4 @@
    public Result<?> getDic(){
        return Result.success(enumService.getDic());
    }

}
}