wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangliwen 2022-06-20 14:27:25 +08:00
parent b165e91663 e6b17da32a
commit 0aac656f83
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/workDynamics/dto/WorkDynamicsDTO.java
View File

@ -36,7 +36,7 @@ public class WorkDynamicsDTO implements Serializable {
private Long updater; private Long updater;
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
private Date updateDate; private Date updateDate;
@ApiModelProperty(value = "备用字段1") @ApiModelProperty(value = "摘要")
private String note1; private String note1;
@ApiModelProperty(value = "备用字段2") @ApiModelProperty(value = "备用字段2")
private String note2; private String note2;

2
renren-admin/src/main/java/io/renren/modules/workDynamics/entity/WorkDynamicsEntity.java
View File

@ -59,7 +59,7 @@ public class WorkDynamicsEntity {
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate; private Date updateDate;
/** /**
* 备用字段1 * 摘要
*/ */
private String note1; private String note1;
/** /**

2
renren-admin/src/main/java/io/renren/modules/workDynamics/excel/WorkDynamicsExcel.java
View File

@ -36,7 +36,7 @@ public class WorkDynamicsExcel {
private Long updater; private Long updater;
@ExcelProperty(value = "修改时间", index = 8) @ExcelProperty(value = "修改时间", index = 8)
private Date updateDate; private Date updateDate;
@ExcelProperty(value = "备用字段1", index = 9) @ExcelProperty(value = "摘要", index = 9)
private String note1; private String note1;
@ExcelProperty(value = "备用字段2", index = 10) @ExcelProperty(value = "备用字段2", index = 10)
private String note2; private String note2;

2
renren-admin/src/main/resources/db/V1.4__tb_work_dynamics_update_note1.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `share_platform`.`tb_work_dynamics`
MODIFY COLUMN `note1` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '摘要' AFTER `update_date`;