From faf1d3cc35a3a5f83558946c8056537a4d77fa1f Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期一, 11 九月 2023 09:34:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java b/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
index e10453f..29af15d 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
@@ -26,6 +26,6 @@
     private Integer duration;
 
     @ApiModelProperty(value = "鎶ュ伐绫诲瀷 0璁′欢 1璁℃椂"  )
-    private Integer salaryType;
+    private Integer type;
 
 }

--
Gitblit v1.9.3