'销售钢材sqlbug'

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -2928,8 +2928,6 @@
       </if>
     </where>
     <include refid="orderBy"></include>
-=======
-    <include refid="orderBy1"></include>
->>>>>>> f36fb0a3f2cae1d4e5eaad238e97387b5a8882a2
+
   </select>
 </mapper>