Merge branch 'master' into dev_ycq
# Conflicts:
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/FavoriteMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/FlowNodeMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/MailCategoryMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/MailFlowMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/MailMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/MailSourceEtlMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/MailSourceMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/mapper/WorkMapper.java
# mailbox-outer-admin/src/main/java/com/biutag/outeradmin/service/MailService.java
|