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

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -7077,9 +7077,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (StringUtils.isNotEmpty(warehousebillsDTO.getfCustomno())) {
             item.setfCustomno(warehousebillsDTO.getfCustomno());
         }
-        if (StringUtils.isNotEmpty(warehousebillsDTO.getRemark())) {
-            item.setRemark(warehousebillsDTO.getRemark());
-        }
         item.setfOriginalbilldate(item.getfBsdate());
         item.setfBillingway(warehousebillsDTO.getfBillingway());
         if ("1".equals(warehousebillsDTO.getfChargetype())) {