Merge remote-tracking branch 'origin/developer' into develop

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormColumnDto.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -45,7 +47,7 @@ public class DynamicFormColumnDto  extends BaseDto {
     private String groupCode;
 
     @ApiModelProperty(value = "配置json")
-    private String columnConfig;
+    private JSONObject columnConfig;
 
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;