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

cjl

2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a

 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.JSON;
@@ -218,3 +219,4 @@
        }
    }
}
*/