解决冲突

src/main/java/cn/hnthyy/thmz/mapper/his/ZdUnitCodeMapper.java

@@ -328,12 +328,7 @@ public interface ZdUnitCodeMapper {
     List<ZdUnitCode> selectZdUnitCodeByCodes(@Param("codes") List<String> codes);
 
 
-<<<<<<< HEAD
-=======
 
-
-
->>>>>>> dev-1.0.9
     /**
      * 查询所有的病区
      * @return
@@ -357,10 +352,5 @@ public interface ZdUnitCodeMapper {
     @Select("select bed_no from zy_bed_mi where ward_code =#{code}  and bed_status = 1")
     List<String> selectBedNumByDept(@Param("code") String code);
 
-<<<<<<< HEAD
-=======
-
-
 
->>>>>>> dev-1.0.9
 }