Merge branch 'develop-green' into develop2

src/custom/restcontroller/webmanage/sale/dispatch/SQL/商品发货数量汇总.sql

@@ -1,5 +1,5 @@
 SELECT  t3.itemno,
-        ifnull(t1.batchno,'') batchno
+        ifnull(t1.batchno,'') batchno,
     SUM(t1.qty-ifnull(t1.outwarehouseqty,0)) qty
 FROM sa_dispatch_items t1
     inner join sa_dispatch t2 on t1.siteid = t2.siteid and t1.sa_dispatchid = t2.sa_dispatchid