fix(合并冲突): 合并冲突

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -690,6 +690,7 @@ public class DeviceCheckController {
                     Integer userCId = detailRepo.findById(detailId).get().getUserCId();
 
                     if (task.getBillStatus().equals(END.id) && Objects.nonNull(userCId)  && userCId !=0 && userIsProv(userCId)){
+
                         checkResult = "无误";
                     }else {
                         checkResult = "等待省审核";

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -2294,6 +2294,7 @@ public class RepairController {
             String currentUserUnitName = userUtils.getCurrentUserUnitName();
             //查询维修详情
             List<RepairDetail> byDeviceRepairBillId = repairDetailDao.findByDeviceRepairBillId(repairBill.getId());
+
             //进行过滤
 //            List<RepairDetail> repairDetails = byDeviceRepairBillId.stream().filter(repairDetail -> repairDetail.getRepairBackBillId() == null && repairDetail.getRepairStatus().equals(RepairStatusEnum.WAIT_REPAIR.id) && repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit()))
 //                    .collect(Collectors.toList());
@@ -2313,6 +2314,7 @@ public class RepairController {
 //                if (repairDetail.getLocationUnit())
 //
 //                    repairDetail.setLocationUnit(repairDetail.getOwnUnit());
+
                 repairDetailDao.save(repairDetail);
             });
             //直接删除维修单

dev-union/src/main/resources/htmlTemplate/repair.html

@@ -401,8 +401,8 @@
             position: absolute;
             bottom: 0px;
             right: 150px;
-        
 
+        }
         .oddrowcolor {
             background-color: #fff;
         }
@@ -468,7 +468,7 @@
                                         <th width="50px">密级</th>
                                         <th width="100px">应用领域</th>
                                         <th width="72px">数量</th>
-                                        <th width="120px">装备序列号</th>
+                                        <th width="150px">装备序列号</th>
                                         <th >维修原因</th>
                                     </tr>
                                     <#list documentDevices as dev>
@@ -527,15 +527,14 @@
                                 </table>
                                 <table class="altrowstable2" id="alternatecolor">
                                     <tr style="border-bottom: 1px solid #dedede;">
-                                <th width="70px"></th>
+                                        <th width="70px"></th>
                                         <th width="96px"></th>
                                         <th width="96px"></th>
                                         <th width="50px"></th>
                                         <th width="100px"></th>
                                         <th width="72px"></th>
-                                        <th width="420px"></th>
-                                        <th></th>
-                                        <th></th>
+                                        <th width="150px"></th>
+                                        <th ></th>
                                     </tr>
                                         <tr class="altrowstableTr">
                                             <td></td>