Merge branch 'develop-green' into develop2

src/custom/restcontroller/sale/promotion/SQL/促销方案列表查询.sql

@@ -32,6 +32,7 @@ FROM
 		t1.changedate,
 		t1.sa_openpromotionid,
 		t1.openamount,
+        t1.packagetype,
 		t2.brandname,
 		t3.accountno,
 		t3.accountname