From 15369bf819ca82896bbcada782e6babf2a7d64c9 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Tue, 14 Nov 2023 13:49:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java index a0fca82..a5b3b7e 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java +++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExt.java @@ -1,5 +1,6 @@ package com.moral.api.pojo.ext.allocation; +import com.baomidou.mybatisplus.annotation.TableField; import com.moral.api.entity.Allocation; import com.moral.api.pojo.vo.approvetable.ApproveTableListVo; import com.moral.api.pojo.vo.file.FileVo; @@ -34,4 +35,16 @@ @ApiModelProperty(value = "������������") private List<ApproveTableListVo> approveList; + + //������������������ + @TableField(exist = false) + private String unitName; + + //������������������ + @TableField(exist = false) + private String escalationUnitName; + @TableField(exist = false) + //������������������ + private String polluteTypeName; + } -- Gitblit v1.8.0