hongchao d767bc22b6 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material ... # Conflicts: # bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java # bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java # bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml		2026-01-07 14:47:37 +08:00
..
DeviceManageMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
DirectRotationMapper.xml	优化	2025-12-29 17:41:53 +08:00
InputRecordMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
LabelBindMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
MachineAppendMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
MachineLabelMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
MachineMapper.xml	优化	2025-12-29 17:41:53 +08:00
PartRepairMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
PartTypeMapper.xml	问题修改	2025-08-19 10:29:26 +08:00
PropInfoMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
PropSetMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
StandardConfigManageMapper.xml	修改	2025-09-14 12:34:31 +08:00
SupplierInfoMapper.xml	直转审核接口开发	2025-02-21 01:47:38 +08:00
TypeKeeperMapper.xml	功能优化	2025-09-06 13:29:19 +08:00
TypeLeasePriceHisMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
TypeMapper.xml	Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material	2026-01-07 14:47:37 +08:00
TypeNumHisMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
TypePutInStorageDetailsMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
TypePutInStorageInfoMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
TypeRepairMapper.xml	优化	2025-07-23 09:04:57 +08:00
WarehousingMapper.xml	功能优化	2025-09-04 11:07:53 +08:00
WholeSetMapper.xml	PreventRepeatSubmit	2024-09-27 15:31:39 +08:00
WorkSiteDirectManageMapper.xml	优化	2025-12-03 16:08:23 +08:00