Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-28 71a860affbf97e7be13a2059b6cb001bfd368adb

 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);
}