Merge remote-tracking branch 'origin/master'

# Conflicts:
#	boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkJzdzMapper.java

@@ -77,4 +77,8 @@ import java.util.List;
     List<CzrkJzdz> selectCzrkJzdzListPage(@Param("startNum") int startNum, @Param("endNum") int endNum);
 
     int updateHouseholdRegister(@Param("idCardList")List<String> idCardList,@Param("hzCzrkJzdz")CzrkJzdz hzCzrkJzdz);
+
+    List<CzrkJzdz> selectCzrkJzdzListByDeptId(@Param("deptIdList")List<Long> deptIdList);
+
+    List<CzrkJzdz> selectCzrkJzdzListByRegionId(@Param("regionId")String regionId);
 }

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -171,6 +171,10 @@ public interface CzrkMapper {
 
     List<Czrk> selectLost();
 
+    List<Czrk> selectCzrkListByDeptId(@Param("deptIdList") List<Long> deptIdList);
+
+    List<Czrk> getAllCzrkRegionId(@Param("regionId") String regionId);
+
     /**
      * 查询非正常人员列表(死亡,失踪)
      * @param czrk