Merge remote-tracking branch 'origin/master'

src/main/resources/mapping/PartyCQuery.xml

@@ -35,7 +35,7 @@
         </if>
         group by p.DZZDM,p.DZZMC,p.ZZLB,fbType.SORT
         -- order by PARENTCODE,NODECODE
-        order by fbType.SORT
+        order by p.DZZDM
 
     </select>