Merge remote-tracking branch 'origin/master'

Crunchy

2024-06-04 ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac

 cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -29,7 +29,7 @@

    List<Device> selectDevicePrincipal();

    List<Device> selectDeviceByCategory(String category);
    List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);

    Device selectDeviceByCode(String code);
}