Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

 src/main/resources/mapper/ViewWorkInMapper.xml

@@ -152,4 +152,11 @@
   Order by a.io_time desc
</select>

<!-- 不分页查询所有信息，ERP调用 -->
<select id="getViewWorkOutERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
   select top 100 * from asr_wrkout_view
   where 1=1
   Order by io_time desc
</select>

</mapper>