Merge branch 'master' into master_lz

wms-module-system/src/main/resources/mapper/WorkOrderMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="top.wms.admin.weighManage.mapper.WorkOrderMapper">
+
+    <select id="selectWorkOrderPage" resultType="top.wms.admin.weighManage.model.resp.WorkOrderResp">
+        select
+            w.*,
+            m.material_name
+        from sys_work_order w
+                 left join sys_material_info m on w.material_id = m.id
+        ${ew.customSqlSegment}
+    </select>
+
+</mapper>