Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 5ccc656f6ed10aaf14b662c3392b07e99b9016e0

 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());