Merge branch 'dev' into dev_crkbh_260721

# Conflicts:
#	mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
#	mhd_oms/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-07-23 10:44:31 +08:00
2 changed files with 4 additions and 1 deletions
@@ -40,6 +40,7 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
public MaterialWarehouseControlPO getInfoByMaterialBaseInfoIds(@Param("id") Long id);
public MaterialGoodsRulePO getGoodsInfoByMaterialBaseInfoIds(@Param("id") Long id);
public List<ReservationMaterialInventoryPO> getkcId(@Param("id") Long id, @Param("q") BigDecimal q);
public String getUserNcCode(@Param("id") Long id);