From be5ded9ff80082512529831a8256334a8a4fa1e5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 16:20:34 +0800
Subject: [PATCH] #权限审核添加,优化报价审核,可编辑

---
 src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
index 2d7ab4b..1572031 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -99,6 +99,25 @@
     @TableField("check_data_file")
     private String checkDataFile;
 
+    /**
+     * 琛ㄥ崟鍐呭
+     */
+    @ApiModelProperty(value= "琛ㄥ崟鍐呭")
+    private String form;
+
+    /**
+     * 杩涘害 1: 寮�濮�  2: 缁勯暱瀹℃牳  3: 鍞墠缁勯暱瀹℃牳  4: 瑙勫垝鍛樺鏍�  5: 瀹℃壒閫氳繃
+     */
+    @ApiModelProperty(value= "杩涘害 1: 寮�濮�  2: 缁勯暱瀹℃牳  3: 鍞墠瀹℃牳  4: 瀹℃壒閫氳繃  ")
+    private Integer settle;
+
+    /**
+     * 瀹℃牳杩涘害
+     */
+    @ApiModelProperty(value= "瀹℃牳杩涘害")
+    @TableField("settle_msg")
+    private String settleMsg;
+
     public ReimburseOnline() {}
 
     public ReimburseOnline(String title, String sheetData, Date createTime, String filepath) {
@@ -153,9 +172,9 @@
         OrderService orderService = SpringUtils.getBean(OrderService.class);
         Order order = orderService.selectById(this.itemId);
         if (!Cools.isEmpty(order)){
-            return String.valueOf(order.getUuid());
+            return String.valueOf(order.getUuid()+"---"+order.getName());
         }
-        return null;
+        return "闈為」鐩瀷鎶ラ攢";
     }
 
     public String getUser$() {

--
Gitblit v1.9.1