From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001 From: luliqiang <kidgrow> Date: Thu, 31 Dec 2020 16:55:30 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java index d2f1139..71bd2aa 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java @@ -1,6 +1,9 @@ package com.kidgrow.oprationcenter.model; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.kidgrow.common.model.SuperModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -33,18 +36,13 @@ /** * 操作人ID */ - @NotEmpty(message = "操作人ID不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** * 操作人姓名 */ @NotEmpty(message = "操作人姓名不能为空") private String userName; - /** - * 应用ID - */ - @NotEmpty(message = "应用ID不能为空") - private Long appId; /** * 应用名称 */ @@ -61,6 +59,7 @@ /** * 是否删除,1删除,0未删除 */ + @TableLogic private Boolean isDel; /** * 状态,1启用,0停用 -- Gitblit v1.8.0