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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

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

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

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