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

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -2583,7 +2583,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 if (item.getPreDeliveryDate() != null) {
                     det.setPreDlvDa(Integer.parseInt(DateUtils.parseDateToStr(FormatsType.YYYYMMDD, item.getPreDeliveryDate())));
                 }
-                det.setTaxId("");
+                det.setTaxId("VT000");
                 det.setIsOutAllot(false);
                 det.setIxTy(1);
                 det.setProdId(item.getProductNo() != null ? item.getProductNo() : "");

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderReturnServiceImpl.java

@@ -675,7 +675,7 @@ public class OrderReturnServiceImpl extends ServiceImpl<OrderReturnMapper, Order
             for (OrderReturnItemVo item : items) {
                 SalBkDet det = new SalBkDet();
                 det.setBlNo(orderReturn.getReturnNo());
-                det.setTaxId("");
+                det.setTaxId("VT000");
                 det.setFrBlNo(orderReturn.getOrderNo());
                 det.setFrRowCd(item.getOrderProductId() != null ? item.getOrderProductId().intValue() : null);
                 det.setFrSrcTag(1);