diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java index 3a6bb1f..7b497cb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java @@ -127,6 +127,11 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo @ColDefine(type = ColType.MYSQL_JSON) private List otherFiles; + @Column + @Comment("风险告知书上传") + @ColDefine(type = ColType.TEXT) + private String riskText; + @Column @Comment("活动类型") @ColDefine(type = ColType.INT, width = 10) diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java index d80f8be..7657075 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java @@ -91,6 +91,7 @@ public class UnionActivityRegisterController { act.groupId, act.signStartTime, act.signEndTime, + act.riskText, abs.`name` AS projectTypeName, creater.username AS createUserName, creater.mobile as createUserMobile diff --git a/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpActivity.java b/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpActivity.java index 3e1faf1..03001dc 100644 --- a/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpActivity.java +++ b/src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpActivity.java @@ -70,6 +70,11 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH @Comment("活动介绍") private String introduce; + @Column + @ColDefine(customType = "longtext") + @Comment("风险告知书") + private String riskText; + @Column @ColDefine(type = ColType.INT, width = 10) @Comment("活动限制标识") diff --git a/src/main/resources/static/components/plugins/FileUpload.vue b/src/main/resources/static/components/plugins/FileUpload.vue index 65bc8b3..12614cf 100644 --- a/src/main/resources/static/components/plugins/FileUpload.vue +++ b/src/main/resources/static/components/plugins/FileUpload.vue @@ -1,7 +1,8 @@