Merge branch 'huacheng_shuangzheng' into huacheng

101captain

2022-06-17 dfda1125327a8ff17e0db51ba779c545bea5eaa0

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -193,7 +193,7 @@
     * @param id
     * @return
     */
    List<PartyBuildingMemberVO> getDetailByApp(Long id);
    PartyBuildingMemberVO getDetailByApp(Long id);

    PartyBuildingMemberVO selectDetail(@Param("userId") Long userId,@Param("type")Integer type);
}