From 56440a580924c199d3e84aef223e2772a02adb44 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 04 十二月 2023 12:21:15 +0800
Subject: [PATCH] #供应商修改
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index c991acf..96d2d41 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,29 +22,31 @@
public class Company {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private Integer creatorName;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -55,11 +58,11 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ApiModelProperty(value = "鎺掑簭鐮�")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@@ -67,19 +70,23 @@
@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
@ExcelColumn(name="绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
private Integer type;
- @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)", example = "1")
+ @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)")
@ExcelColumn(name="鍒嗙被缂栫爜(鍏宠仈category)")
private Integer categoryId;
- @ApiModelProperty(value = "浼佷笟浠ｇ爜", example = "1")
+ @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
+ @TableField(exist = false)
+ private Integer categoryName;
+
+ @ApiModelProperty(value = "浼佷笟浠ｇ爜")
@ExcelColumn(name="浼佷笟浠ｇ爜")
private Integer code;
- @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
+ @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
private Integer parentId;
@@ -91,17 +98,16 @@
@ExcelColumn(name="鑱旂郴鐢佃瘽")
private String linkPhone;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
private Integer hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "ERP鏍囪瘑")
@@ -110,10 +116,9 @@
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
- @ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer erpStatus;
@@ -123,10 +128,9 @@
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
@ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date ddDate;
- @ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer ddStatus;
@@ -134,13 +138,12 @@
@ExcelColumn(name="椋炰功鏍囪瘑")
private String fsId;
- @ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer fsStatus;
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date fsDate;
}
--
Gitblit v1.9.3