Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/handlingunit/entity/dto/HandlingUnitDto.java

@@ -62,6 +62,7 @@ public class HandlingUnitDto {
     private String stationId;
     private String stationArea;
     private String callingFlag;
+    private String engChgLevel;
     // 关联信息
     private List<HandlingUnitDetailDto> details;
     private List<HandlingUnitDto> children;

src/main/resources/mapper/warehouse/LabelQueryMapper.xml

@@ -29,7 +29,7 @@
             h.remark,
             w.WareHouseName as warehouseName,
             l.LocationName as locationName,
-        h.height,h.wdr
+        h.height,h.wdr,h.eng_chg_level as engChgLevel,h.expired_date as expiredDate
         FROM handling_unit h WITH (NOLOCK)
         LEFT JOIN warehouse w WITH (NOLOCK) ON h.warehouse_id = w.WareHouseID AND h.site = w.Site
         LEFT JOIN location l WITH (NOLOCK) ON h.location_id = l.LocationID AND h.site = l.Site