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

cjl

2023-07-11 57c8c3c1fd6bd32be6256529210e7818bc25cf6e

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

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