Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

src/main/java/com/steerinfo/dil/controller/AmstruckInwardPlanController.java

@@ -57,6 +57,7 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
     public RESTfulResult deleteTruckPlan(@PathVariable("planId") BigDecimal planId) {
         int result = amstruckInwardPlanService.deleteTruckPlan(planId);
         return success(result);
+
     }
     /**
      * 修改运输计划
@@ -133,6 +134,7 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         return success(data);
     }
 
+
     /**
      * 承运商下拉
      * @return

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardPlanMapper.xml

@@ -579,6 +579,7 @@
         DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
         AIP.PLAN_NUMBER AS "planNumber",
         RCA.CARRIER_NAME AS "carrierName",
+        RCA.CARRIER_ID AS "carrierId",
         AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
         AIR.REQUIREMENT_NUMBER AS "requirementNumber",
         AIP.PLAN_ISSUE_TIME AS "planIssueTime",