bug

jiangping

2023-11-07 64b432916af9c9218ab3f3eca614e26c542142ae

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