Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp

modules/module-infra-biz/src/main/java/cd/casic/module/infra/convert/config/ConfigConvert.java

@@ -19,10 +19,10 @@ public interface ConfigConvert {
 
     List<ConfigRespVO> convertList(List<ConfigDO> list);
 
-    @Mapping(source = "configKey", target = "key")
+//    @Mapping(source = "configKey", target = "key")
     ConfigRespVO convert(ConfigDO bean);
 
-    @Mapping(source = "key", target = "configKey")
+//    @Mapping(source = "key", target = "configKey")
     ConfigDO convert(ConfigSaveReqVO bean);
 
 }

modules/module-infra-biz/src/main/java/cd/casic/module/infra/convert/file/FileConfigConvert.java

@@ -11,12 +11,12 @@ import org.mapstruct.factory.Mappers;
  *
  * @author mianbin modified from yudao
  */
-@Mapper
+//@Mapper
 public interface FileConfigConvert {
 
     FileConfigConvert INSTANCE = Mappers.getMapper(FileConfigConvert.class);
 
-    @Mapping(target = "config", ignore = true)
+//    @Mapping(target = "config", ignore = true)
     FileConfigDO convert(FileConfigSaveReqVO bean);
 
 }

modules/module-system-biz/src/main/java/cd/casic/module/system/convert/dict/DictDataConvert.java

@@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers;
 
 import java.util.List;
 
-@Mapper
+//@Mapper
 public interface DictDataConvert {
 
     DictDataConvert INSTANCE = Mappers.getMapper(DictDataConvert.class);

modules/module-system-biz/src/main/java/cd/casic/module/system/convert/dict/DictTypeConvert.java

@@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers;
 
 import java.util.List;
 
-@Mapper
+//@Mapper
 public interface DictTypeConvert {
 
     DictTypeConvert INSTANCE = Mappers.getMapper(DictTypeConvert.class);