Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-30 7a7c01d8ae0c0f2d7ffcaf8de5a7a1d49ba92c10

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java

@@ -73,4 +73,17 @@
     * @return
     */
    Integer checkIsVolunteer(@Param("userId") Long userId);

    /**
     * 统计在职干部特长
     * @return
     */
    List<ComPbMemberTypeVO> statisticsPbMemberType();

    /**
     * 单位类型
     * @return
     */
    List<ComPbMemberTypeVO> selectUnitByNatureName();

}