Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 aa343eafae29f8171d22496ce876ead1d0f07bd0

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

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



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