From befc0e5606ab7c913dda0346152a4150d0ee5f79 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期五, 06 六月 2025 09:35:59 +0800 Subject: [PATCH] 供应商,客户优化 --- basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java | 48 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 41 insertions(+), 7 deletions(-) diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java b/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java index f174c36..c1ea428 100644 --- a/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java +++ b/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java @@ -1,6 +1,10 @@ package com.ruoyi.basic.entity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.MyBaseEntity; import lombok.Data; @@ -25,50 +29,80 @@ * 渚涘簲鍟嗗叏绉帮紝涓氬姟鍦烘櫙涓敮涓�璇嗗埆鐨勫悕绉帮紝 */ @TableField(value = "supplier_name") + @Excel(name = "渚涘簲鍟�") private String supplierName; /** * 渚涘簲鍟嗙◣鍔$櫥璁板敮涓�鏍囪瘑锛堝缁熶竴绀句細淇$敤浠g爜锛夛紝鐢ㄤ簬璐㈢◣绠$悊 */ @TableField(value = "taxpayer_id") + @Excel(name = "绋庡彿") private String taxpayerId; /** * 渚涘簲鍟嗚惀涓氭墽鐓ф敞鍐屽湴鍧�鎴栦富瑕佺粡钀ュ満鎵�锛岄粯璁ょ┖瀛楃涓� */ @TableField(value = "business_address") + @Excel(name = "娉ㄥ唽鍦板潃") private String businessAddress; /** * 渚涘簲鍟嗘敹娆鹃摱琛岃处鎴蜂俊鎭紝榛樿绌哄瓧绗︿覆锛岀敤浜庤祫閲戝線鏉� */ @TableField(value = "bank_account") + @Excel(name = "閾惰璐︽埛") private String bankAccount; /** * 渚涘簲鍟嗛摱琛岃处鎴风殑寮�鎴锋満鏋勫悕绉帮紝榛樿绌哄瓧绗︿覆锛� */ @TableField(value = "bank_name") + @Excel(name = "閾惰璐︽埛") private String bankName; /** * 渚涘簲鍟嗕笟鍔″鎺ヤ汉濮撳悕 */ @TableField(value = "contact_person") + @Excel(name = "鑱旂郴浜�") private String contactPerson; /** * 渚涘簲鍟嗚仈绯讳汉鐨勮仈绯诲湴鍧� */ @TableField(value = "contact_address") + @Excel(name = "鑱旂郴鍦板潃") private String contactAddress; + + /** + * 鑱旂郴浜虹殑鐢佃瘽 + */ + @TableField(value = "contact_phone") + @Excel(name = "鑱旂郴鐢佃瘽") + private String contactPhone; /** * 渚涘簲鍟嗘墍鍦ㄧ渷浠界殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0 */ - @TableField(value = "province_id") - private Long provinceId; + @TableField(value = "b_province_id") + private Long BProvinceId; /** * 渚涘簲鍟嗘墍鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0 */ - @TableField(value = "city_id") - private Long cityId; + @TableField(value = "b_city_id") + private Long BCityId; /** * 渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎 */ - @TableField(value = "district_id") - private Long districtId; + @TableField(value = "b_district_id") + private Long BDistrictId; + + /** + * 鑱旂郴鍦板潃 鐪佷唤鐨処D + */ + @TableField(value = "c_province_id") + private Long CProvinceId; + /** + * 鑱旂郴鍦板潃鎵�鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0 + */ + @TableField(value = "c_city_id") + private Long CCityId; + /** + * 鑱旂郴鍦板潃鎵�鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎 + */ + @TableField(value = "c_district_id") + private Long CDistrictId; } \ No newline at end of file -- Gitblit v1.9.3