weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
#	mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
This commit is contained in:
王奎兴
2026-04-18 14:27:49 +08:00
parent 83ff6c46ca aa441e0518
commit 3241b0fce2
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
+3
View File
@@ -410,6 +410,9 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("tms订单号")
private String tmsOrderNumber;
@ApiModelProperty("订单来源")
private String reservationOrderSource;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
+3
View File
@@ -437,4 +437,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
private String salesmanId;
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("tms订单号")
private String tmsOrderNumber;
}