Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-08 bb6248de48262d75d5cb62c9f18c87f5cf72f538

 flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java

@@ -8,7 +8,7 @@
{
    public List<HuaChengSysUser> selectConfigList();

    public HuaChengSysUser selectData(String userId,String account,String phone);
    public List<HuaChengSysUser> selectData(String userId,String account,String phone);

    public int selectNum();
}