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

yanghui

2022-10-11 4f66077ada1964ef34da6410b2f1fadbd8eb6808

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

@@ -67,7 +67,7 @@
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
                //默认  1系统后台用户
                newSysUser.setUserType("1");
                newSysUser.setUserType("3");
                newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                newSysUser.setUserId(huaChengSysUser.getUserId());
                newSysUser.setUserName(huaChengSysUser.getNickName());