From eee82fc63bf8b0b48bda5d6c89a491974a20bc97 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 09:52:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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