From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 81e09f4..ed3ee89 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -137,14 +137,6 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
-<<<<<<< HEAD
-// BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
-// s.divide(new BigDecimal(0),2);
-// model.setSalary(s.doubleValue());
-=======
-// int s= Constants.formatIntegerNum(model.getSalary());
-// model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2));
->>>>>>> dev
}
}
return PageData.from(new PageInfo<>(result));
--
Gitblit v1.9.3