Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 945c7091d1db4e156a7a2b5ccd24c888cbce40a5

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -422,6 +422,11 @@
    int isExpertAccount(String account);

    /**
     * 是否为党员
     * */
    int isDpcMember(@Param("phone") String phone,@Param("name")String name);

    /**
     * 查询两个appid的用户做更新
     * @param userId
     * @return