jiang 5d6389bf3f Merge remote-tracking branch 'origin/main' ... # Conflicts: # resources/mybatis/bm/ProjectManageMapper.xml # resources/mybatis/scrap/ScrapTaskRecordMapper.xml # src/com/bonus/bm/controller/ProjectManageController.java # src/com/bonus/bm/dao/ProjectManageDao.java # src/com/bonus/bm/service/ProjectManageService.java		2025-12-03 20:12:21 +08:00
..
CheckQrCodeMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
DisassemblyManagementMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
GpsBindingMapper.xml	机具库存收藏修改	2025-12-03 19:52:59 +08:00
InventoryRecordMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
LibNumsInventoryMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MaLeaseMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MaOrgMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MaStockMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MaTotalChangeWarnMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MachineMapper.xml	修改	2025-12-02 16:14:14 +08:00
MachineRfidInfoMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MachineRfidMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
MachineTypeMapper.xml	修改	2025-12-02 16:14:14 +08:00
MachineVersionMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
QRCodeMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
VenderMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00
pickDetailsMapper.xml	Initial commit	2025-06-20 17:47:53 +08:00