Merge branch 'develop' into develop2

src/custom/restcontroller/R.java

@@ -6678,6 +6678,10 @@ public class R {
         }
     }
 
+    public static class ID2024080614131103 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/sale/promotion/promotion.java

@@ -810,4 +810,13 @@ public class promotion extends Controller {
         return getSucReturnObject().toString();
 
     }
+
+    @API(title = "查询促销方案里的套餐明细", apiversion = R.ID2024080614131103.v1.class)
+    @CACHEING
+    public String queryPackagetypemx() throws YosException {
+        long sa_promotionid =content.getLong("sa_promotionid");
+        Rows rows = dbConnect.runSqlQuery("select distinct packagetypemx from  sa_promotion_items where siteid='"+siteid+"' and ifnull(packagetypemx,'')!='' and sa_promotionid="+sa_promotionid);
+        return getSucReturnObject().setData(rows).toString();
+    }
+
 }