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

src/custom/function/OrderFeeCalculatePlan1.java

@@ -221,6 +221,7 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
                 "grossweight", "weight");
         querySQL.setWhere("t1.sa_orderid", sa_orderid);
         querySQL.setWhere("t3.classname", classname);
+        querySQL.setWhere("t3.status", "启用");
         querySQL.setTableAlias("t1");
         return querySQL.query();
     }