From 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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