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

cjl

2023-07-24 3ce298bd6f26c0807074dc50c73abf0c3abeaf53

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

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

import com.moral.api.service.*;
@@ -199,3 +200,4 @@
        }
    }
}
*/