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

lidongdong

2022-10-27 ae2b1e123549055a0e2fe4514978ab7288b74316

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

@@ -56,7 +56,14 @@

        if(user==null)
        {
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
            HuaChengSysUser huaChengSysUser=null;

            if(list!=null || list.size()>0 )
            {
                huaChengSysUser=list.get(0);
            }

            if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
            {
                //提示用户名或密码错误