Merge remote-tracking branch 'origin/feature/watermark' into feature/watermark

# Conflicts:
#	pom.xml
#	src/main/java/com/zhixinghe1/ots/atomic/service/IAttachmentService.java
#	src/main/java/com/zhixinghe1/ots/atomic/service/impl/AttachmentServiceImpl.java
#	src/main/java/com/zhixinghe1/ots/config/BizConfig.java
#	src/main/java/com/zhixinghe1/ots/service/controller/OssController.java
#	src/main/java/com/zhixinghe1/ots/service/controller/WaterMarkController.java
#	src/main/java/com/zhixinghe1/ots/service/manager/IOssManager.java
#	src/main/java/com/zhixinghe1/ots/service/manager/impl/OssManagerImpl.java
#	src/main/resources/application.yml

src/main/java/com/zhixinghe1/ots/domain/converter/AttachmentConverter.java

@@ -0,0 +1,14 @@
+package com.zhixinghe1.ots.domain.converter;
+
+import com.zhixinghe1.ots.atomic.entity.Attachment;
+import com.zhixinghe1.ots.common.converter.mapstruct.BaseEntityConverter;
+import com.zhixinghe1.ots.domain.dto.AttachmentDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+
+/**
+ * 附件对象转换工具
+ */
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface AttachmentConverter extends BaseEntityConverter<Attachment, AttachmentDto> {
+}