Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

4 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/main/resources/mapper/stock/StockOutRecordMapper.xml

@@ -30,10 +30,10 @@
        LEFT JOIN sys_user as u on sor.create_user = u.user_id
        <where>
            <if test="params.timeStr != null and params.timeStr != ''">
                and sor.create_time like concat('%',#{param.timeStr},'%')
                and sor.create_time like concat('%',#{params.timeStr},'%')
            </if>
            <if test="params.productName != null and params.productName != ''">
                and p.product_name like concat('%',#{param.productName},'%')
                and p.product_name like concat('%',#{params.productName},'%')
            </if>
            <if test="params.type != null and params.type != ''">
                and sor.type = #{params.type}