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

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 screen-manage/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> {