王奎兴 b05c87e291 Merge branch 'dev' into dev-bms-260826 ...

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java
#	mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
#	mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
#	mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java
#	mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
#	mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
#	mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml

2026-09-05 15:14:35 +08:00

..

abnormalAddressBook

first commit

2025-11-20 10:45:16 +08:00

addressBook

数据权限的修改

2026-01-10 16:39:33 +08:00

associationWarehouse

bug更改

2026-04-22 15:21:36 +08:00

batch

first commit

2025-11-20 10:45:16 +08:00

batchDetail

批次规则的修改

2026-01-29 13:50:03 +08:00

brand

first commit

2025-11-20 10:45:16 +08:00

commonLineDriver

first commit

2025-11-20 10:45:16 +08:00

container

first commit

2025-11-20 10:45:16 +08:00

lease

feat(system模块lease): 租赁管理增加停用功能，停用后不参与出租率计算

2026-08-11 18:03:09 +08:00

materialBaseInfo

物料管理-新增/编辑-添加毛重，修改汇率管理问题

2026-05-11 15:55:43 +08:00

materialClassify

bms改造;

2026-09-04 11:11:39 +08:00

messageManagement

first commit

2025-11-20 10:45:16 +08:00

pack

基础数据的BUG修改

2026-02-07 17:22:11 +08:00

packDetail

影响到其它地方了修改物料改为前端过滤

2026-03-14 09:02:39 +08:00

platform

first commit

2025-11-20 10:45:16 +08:00

platformGroup

first commit

2025-11-20 10:45:16 +08:00

platformUseTime

first commit

2025-11-20 10:45:16 +08:00

shipperLeaseDetails

仓库出租率功能模块

2026-01-29 14:44:27 +08:00

storageLocation

fix(system): 库位库区排序修改

2026-08-07 18:51:04 +08:00

storageLocationGroup

仓库管理按时间倒序排序

2026-02-09 13:16:25 +08:00

storageSection

feat(system):库区管理新增库区面积合计查询接口

2026-08-28 18:01:44 +08:00

thirdPartyServiceReqLog

first commit

2025-11-20 10:45:16 +08:00

warehouse

仓库管理添加单号生成规则字段;

2026-08-06 16:40:56 +08:00

ContractManageDetailMapper.xml

查询显示科目单价;

2026-04-02 16:03:22 +08:00

ContractManageMapper.xml

bms改造;

2026-09-01 16:58:39 +08:00

ContractManageParametersMapper.xml

bms改造;

2026-09-01 16:58:39 +08:00

ExpenseAccountMapper.xml

feat(system):查询信息根据编码和组织ID

2026-08-12 16:44:47 +08:00

ProjectManageMapper.xml

BMS项目管理显示BUG

2026-02-27 11:42:44 +08:00

ScheduledTaskLogMapper.xml

定时推送账单添加执行日志;

2026-03-24 10:35:37 +08:00

ScheduledTaskMapper.xml

推送流水定时任务去除状态查询;

2026-03-23 17:08:38 +08:00

ServiceItemsManageMapper.xml

BMS页面数据按照创建时间倒序排序

2026-02-26 10:02:43 +08:00

SysAppVersionManageMapper.xml

first commit

2025-11-20 10:45:16 +08:00

SysCityMapper.xml

达梦适配修改

2025-12-05 10:47:46 +08:00

SysCountyMapper.xml

达梦适配修改

2025-12-05 10:47:46 +08:00

SysMultistageDictMapper.xml

first commit

2025-11-20 10:45:16 +08:00

SysPictureManageMapper.xml

first commit

2025-11-20 10:45:16 +08:00

SysProvinceMapper.xml

达梦适配修改

2025-12-05 16:41:05 +08:00

UserConfigSwitchMapper.xml

first commit

2025-11-20 10:45:16 +08:00

UserFormConfigInterface.xml

达梦适配修改

2025-12-05 10:47:46 +08:00

UserFormConfigMapper.xml

first commit

2025-11-20 10:45:16 +08:00