From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:21:40 +0800
Subject: [PATCH] 初始化1.0.1

---
 server/src/main/java/doumeemes/dao/business/model/SalaryParam.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
index 32a4fec..e686ebc 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -66,12 +66,9 @@
     @ExcelColumn(name="bom缂栫爜锛堝叧鑱攂om琛級")
     private Integer bomId;
 
-    @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
-    @ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
-    private Integer salary;
     @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
     @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
-    private Integer salaryPrice;
+    private Integer salary;
 
     @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
     @ExcelColumn(name="鏍囧噯鏁伴噺")

--
Gitblit v1.9.3