Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-WMSH-API

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

@@ -362,6 +362,7 @@
         ON rp.PORT_ID = wgm.PORT_ID
         WHERE wgm.DELETED = 0
         AND rp.PORT_NAME ! = '万州港'
+        order by rp.PORT_NAME,rm.MATERIAL_NAME
         )
         <where>
             <if test="portName != null">