Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-18 044a784761b5a7c43c227871d92e3d0d275bcaff

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {

    SysUser getUserById(Long id);

    SysUser getUserByAccount(String account);

    /**
@@ -29,7 +30,7 @@



    SysUser selectData(String userId);
    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);


    /**