Merge remote-tracking branch 'origin/master' into master

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

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

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
@@ -12,4 +11,5 @@
 **/
@Mapper
public interface ComPbOrgDAO extends BaseMapper<ComPbOrgDO> {
	
}