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

cjl

2023-07-06 4434ac67c79a51525b57f4b2020d24678a2b3f73

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

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