Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-21 aac8325e040609fce28a8897a22f0857ca6e5de1

 src/main/resources/mapper/LocDetlMapper.xml

@@ -100,6 +100,9 @@
        <if test="startTime!=null and endTime!=null">
            and a.modi_time between #{startTime} and #{endTime}
        </if>
        <if test="crnNo!=null and crnNo!='' ">
            and b.crn_no=#{crnNo}
        </if>
    </sql>

    <select id="getStockOutPage" resultMap="BaseResultMap">