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

jinpengyong

2023-08-28 0e0643aed8857e9b845ee5dcc56cdec652bc89f2

 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;
@@ -222,3 +223,4 @@
        }
    }
}
*/