Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -751,7 +751,7 @@
             RTC.TRUCK_CALCULATE_NUMBER "steelyardNum",
             RS.SUPPLIER_NAME            "sendUnit",
             RSH.SHIPPER_NAME            "ReceivUnit",
-            RM.MATERIAL_NAME            "materiaName",
+            CONCAT(RM.MATERIAL_NAME ,CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL))    "materiaName",
             RM.MATERIAL_ID              "materialId",
             CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
             RW.WAREHOUSE_NAME           "unloadPlace",