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

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/tender/BusBillofquantitiesLimitListMapper.xml

@@ -28,6 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHEN #{item.id} THEN #{item.unitPrice}
         </foreach>
         ELSE unit_price
+        END,
+        tax_rate = CASE id
+        <foreach collection="list" item="item">
+            WHEN #{item.id} THEN #{item.taxRate}
+        </foreach>
+        ELSE tax_rate
         END
         WHERE id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">