Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/customscheme/SQL/商品定制方案明细列表查询.sql

@@ -2,4 +2,5 @@ SELECT
     t1.*
 FROM
     sa_customscheme_items t1
-where $where$ and t1.siteid=$siteid$ and t1.sa_customschemeid=$sa_customschemeid$
+where $where$ and t1.siteid=$siteid$ and t1.sa_customschemeid=$sa_customschemeid$
+order by t1.sequence