Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-06 6c84eff9302df57bc41a5200c2f88f67b669c460

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

@@ -49,7 +49,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType,String userName,List<String> ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead);

    /**
     * 发送验证码(如果没有该用户则新建用户)