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

cjl

2023-10-27 165f11c315a0283c6cf32572dddee5c81351cad8

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

@@ -9,7 +9,7 @@
 * </p>
 *
 * @author moral
 * @since 2021-03-09
 * @since 2021-04-06
 */
public interface OrganizationMapper extends BaseMapper<Organization> {