liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat_partyMemberEvent' into uat_code

Browse Source
This commit is contained in:
517612449@qq.com
2022-07-14 15:23:16 +08:00
parent 6ab07f7db0 855a1dbb8a
commit 5b46de5b06
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java
View File

@ -41,6 +41,11 @@ public class EventMaintainInVO implements Serializable {
*/ */
@ApiModelProperty(value = "类别 1-首页，2-活动风采，3-攻坚克难") @ApiModelProperty(value = "类别 1-首页，2-活动风采，3-攻坚克难")
private String type; private String type;
/**
* 意见类型：1-指导型 2-建设型 3-规划型 4-政策型
*/
@ApiModelProperty(value = "意见类型：1-指导型 2-建设型 3-规划型 4-政策型")
private String suggestionType;
/** /**

4
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainOutVO.java
View File

@ -1,7 +1,5 @@
package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -85,7 +83,6 @@ public class EventMaintainOutVO implements Serializable {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(typeHandler = CustomLocalDateTimeTypeHandler.class)
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
@ -94,7 +91,6 @@ public class EventMaintainOutVO implements Serializable {
@ApiModelProperty(value = "发布时间") @ApiModelProperty(value = "发布时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(typeHandler = CustomLocalDateTimeTypeHandler.class)
private LocalDateTime sendTime; private LocalDateTime sendTime;
/** /**
* 发布人 * 发布人