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

lidongdong

2022-10-21 a6c7ae8b7578135f1be4ab58e8cc0d49c86529ec

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -334,8 +334,6 @@
            return error("输入密码与原密码不能相同！");
        }



        return toAjax(IUserService.updateConfig(config));
    }