Merge branch 'develop' into develop2

# Conflicts:
#	src/custom/restcontroller/R.java

src/custom/restcontroller/R.java

@@ -5647,6 +5647,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2024060515370903 {
+        public static class v1 {
+        }
+    }
     public static class ID20240320152902 {
         public static class v1 {
         }

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -3615,6 +3615,15 @@ public class Order extends Controller {
         return getSucReturnObject().setData(rolename).toString();
     }
 
+    @API(title = "查询订单中商品单价为0的记录", apiversion = R.ID2024060515370903.v1.class)
+    @CACHEING
+    public String newApiMethod() throws YosException {
+        Long sa_orderid = content.getLong("sa_orderid");
+        Rows rows =dbConnect.runSqlQuery("select t2.itemno,t1.* from sa_orderitems t1 inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.sa_orderid=" + sa_orderid + " and t1.siteid='" + siteid + "' and  t1.price<=0");
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+
     /**
      * 更新订单扣款信息
      */