Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/sale/promotion/SQL/促销方案商品查询.sql

@@ -18,6 +18,7 @@ SELECT
 	t2.itemname,
 	t2.spec,
 	t2.model,
+	t2.standards,
 	t2.packageqty,
 	t3.unitname,
 	t5.oldprice,