Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-13 1bcef6a688ffbee58c347bbd87e1b5db08075041

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java

@@ -38,7 +38,7 @@
    /**
     * 诺瓦硬件设备
     */
    public LedPlayerEntity getBySnAndPlayerId(String sn){
    public LedPlayerEntity getBySnAndPlayerSn(String sn){
        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
        if(one==null){
            throw new RuntimeException("诺瓦设备不存在");