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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

 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.*;
@@ -200,4 +199,3 @@
        }
    }
}
*/