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

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

 screen-manage/src/main/java/com/moral/api/mapper/ManageLogMapper.java

@@ -9,7 +9,7 @@
 * </p>
 *
 * @author moral
 * @since 2021-04-02
 * @since 2021-04-12
 */
public interface ManageLogMapper extends BaseMapper<ManageLog> {