Merge branch 'develop-green' into develop2

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

@@ -618,6 +618,11 @@ public class OrderItems extends Controller {
                 where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("packagetypemx") && !"".equals(whereObject.getString("packagetypemx"))) {
+                where.append(" and(");
+                where.append("t4.packagetypemx ='").append(whereObject.getString("packagetypemx")).append("' ");
+                where.append(")");
+            }
         }
         Long sa_orderid = content.getLong("sa_orderid");
         Rows orderRows = getOrderRows(this, sa_orderid);