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

src/custom/restcontroller/webmanage/sale/promotion/SQL/促销方案参与授权范围查询.sql

@@ -20,5 +20,5 @@ FROM sa_promotion_auth t1
          left join sa_agents t3 on t1.siteid = t3.siteid and t1.sys_enterpriseid = t3.sys_enterpriseid
     AND t1.siteid = t2.siteid
 where t1.siteid = $siteid$
-  and t1.sa_promotionid = $sa_promotionid$
+  and t1.sa_promotionid = $sa_promotionid$ and $tablefilter$
   and $where$