ovo f63b4fc8ba Merge remote-tracking branch 'origin/cell-v9-check-faceModel-smartSchool-v2' into cell-v9-check-faceModel-smartSchool-v2 ... # Conflicts: # shapelight-admin/src/main/java/net/shapelight/modules/mobile/entity/MobilePackageOrder.java # shapelight-admin/src/main/java/net/shapelight/modules/mobile/mapper/MobileCallLogsMapper.java # shapelight-admin/src/main/java/net/shapelight/modules/mobile/mapper/MobileDeviceGroupMapper.java # shapelight-admin/src/main/java/net/shapelight/modules/mobile/mapper/MobileDeviceMapper.java # shapelight-admin/src/main/java/net/shapelight/modules/mobile/mapper/MobilePackageMapper.java # shapelight-admin/src/main/java/net/shapelight/modules/mobile/mapper/MobilePackageOrderMapper.java		2024-11-14 18:37:59 +08:00
..
main	Merge remote-tracking branch 'origin/cell-v9-check-faceModel-smartSchool-v2' into cell-v9-check-faceModel-smartSchool-v2	2024-11-14 18:37:59 +08:00
test/java	虹软激活	2024-11-08 10:35:38 +08:00