Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-09-28 bcc3e41bdd1865c288f7d570ce4da1d5cea32462

 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java

@@ -1,3 +1,4 @@
/*
package com.moral.api.kafka.consumer;

import com.alibaba.fastjson.JSONObject;
@@ -223,3 +224,4 @@
        }
    }
}
*/