Merge remote-tracking branch 'origin/master'

JYW

2024-04-26 500b97419343704696420a44f4aad8892ebe66ba

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