From fb65ffe3606482e15bcdf1fd5adfb1acb1b8e846 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 八月 2023 11:24:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
index bfe6fa0..7d9ba3e 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
@@ -18,7 +18,7 @@
@ApiModelProperty(value = "宸ュ簭鍚嶇О")
private String procedureName;
- @ApiModelProperty(value = "璁′环鏂瑰紡")
- private String type;
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ private Integer type;
}
--
Gitblit v1.9.3