Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml

@@ -14,7 +14,11 @@
               strain.strain_name
        from sys_inventory inventory
        LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
        where is_deleted = 0
        where
        <if test="inventory.strainId !=null and inventory.strainId != '' ">
            inventory.strain_id = #{inventory.strainId} AND
        </if>
              is_deleted = 0
    </select>

</mapper>