提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml

@@ -64,8 +64,6 @@
               ORDER BY T1.id DESC) AS T
             ${ew.customSqlSegment}
     </select>
-<<<<<<< HEAD
-=======
     <select id="getPatientBusNoList" resultType="com.openhis.web.nenu.dto.GfStudentPeisDto">
         SELECT T1.bus_no as bus_no
              , T.id_number as id_number
@@ -101,6 +99,5 @@
         ORDER BY T.id DESC
         LIMIT 1 OFFSET 0
     </select>
->>>>>>> v1.3
 
 </mapper>