feat(装备申请模块，装备配发模块.装备退回,装备维修，装备自查，装备使用报告): 新增单位id字段

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBackBill.java

@@ -52,14 +52,12 @@ public class AllotBackBill {
     @ApiModelProperty(value = "发件单位")
     private String sendUnit;
 
-    @NotNull(message = "sendUnit不能为空")
     @ApiModelProperty(value = "发送单位Id")
     private Integer sendUnitId;
 
     @ApiModelProperty(value = "收件单位")
     private String receiveUnit;
 
-    @NotNull(message = "sendUnit不能为空")
     @ApiModelProperty(value = "接受单位id")
     private Integer receiveUnitId;
 

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java

@@ -61,7 +61,6 @@ public class AllotBill {
     @ApiModelProperty(value = "配发单位")
     private String sendUnit;
 
-    @NotNull(message = "sendUnitId不能为空")
     @ApiModelProperty(value = "发送单位Id")
     private Integer sendUnitId;
     /**
@@ -70,7 +69,6 @@ public class AllotBill {
     @ApiModelProperty(value = "收件单位")
     private String receiveUnit;
 
-    @NotNull(message = "sendUnitId不能为空")
     @ApiModelProperty(value = "接受单位id")
     private Integer receiveUnitId;
     /**

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

@@ -155,8 +155,13 @@ public class RepairController {
             sendUnits.add(repairBill.getSendUnitId().toString());
         });
         //如果是同一单位返回单位名称，否则返error
-        if (sendUnits.size() == 1) {
-            return ResponseEntity.ok(sendUnits.iterator().next());
+//        if (sendUnits.size() == 1) {
+//            return ResponseEntity.ok(sendUnits.iterator().next());
+//        } else {
+//            return ResponseEntity.ok("error");
+//        }
+        if (sendUnits.size() == 2) {
+            return ResponseEntity.ok(sendUnits);
         } else {
             return ResponseEntity.ok("error");
         }

dev-usereport/src/main/java/com/tykj/dev/device/usereport/subject/domin/DeviceUseReport.java

@@ -45,6 +45,7 @@ public class DeviceUseReport {
      */
     @ApiModelProperty(value = "报告所属单位")
     private String unit;
+
     @ApiModelProperty(value = "报告所属单位Id")
     private Integer unitId;