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

yanghui

2022-10-24 d3b2844621f2ef042e050772c1d80570aba8017a

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

@@ -32,7 +32,9 @@



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


    /**