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

lidongdong

2022-10-24 bd927f5c9f26d5ae89a272e56a4b3bd655bd148f

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

@@ -95,7 +95,7 @@

        config.setUserType("2");

        SysUser user=IUserService.selectData(null,config.getPhonenumber());
        SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
        if (user != null)
        {
            user.setPassword(config.getPassword());