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

lidongdong

2022-11-15 e407181755cbed91d8f94c808caa8ee1685a8e24

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -92,7 +92,7 @@
                newUser.setUserId(huaChengSysUser.getUserId()+"");
                newUser.setLoginName(huaChengSysUser.getPhone());
                newUser.setUserName(huaChengSysUser.getNickName());
                newUser.setUserType("4");
                newUser.setUserType("3");
                newUser.setPhonenumber(huaChengSysUser.getPhone());
                newUser.setSex(huaChengSysUser.getSex());
                newUser.setAvatar(huaChengSysUser.getImageUrl());