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

cjl

2023-10-13 f976feb7ae339c006af150b30802f7edfc8d966f

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