Merge remote-tracking branch 'origin/master'

JYW

2024-04-23 a86d2feff2af246bdf09c32e6591eb590cefa672

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

@@ -24,7 +24,11 @@

    List<Device> authorizedPerson();

    List<Device> search( Integer status, String deviceName, String specificationModel, String largeCategory);
    List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory);

    List<Device> selectDevicePrincipal();

    List<Device> selectDeviceByCategory(String category);

}