From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/entity/Contract.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Contract.java b/src/main/java/com/zy/crm/manager/entity/Contract.java
index 4e29ce7..da2e995 100644
--- a/src/main/java/com/zy/crm/manager/entity/Contract.java
+++ b/src/main/java/com/zy/crm/manager/entity/Contract.java
@@ -205,6 +205,12 @@
@TableField("settle_msg")
private String settleMsg;
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value= "鑺傜偣璐熻矗浜�")
+ private Long director;
+
public Contract() {}
public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long userId, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss, String serial, Long deptId, Long hostId,Integer settle,String settleMsg) {
@@ -266,10 +272,12 @@
case 0:
return "绛夊緟鎻愪氦";
case 1:
- return "绛夊緟瀹℃壒";
+ return "绛夊緟缁勯暱瀹℃壒";
case 2:
- return "绛夊緟纭";
+ return "绛夊緟鎬昏鍔炲鎵�";
case 3:
+ return "绛夊緟纭";
+ case 4:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
--
Gitblit v1.9.1