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

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

@@ -2828,7 +2828,7 @@ public class Order extends Controller {
         // 领域
         sqlFactory.addParameter("tradefield", row.getString("tradefield"));
         //单据日期
-        sqlFactory.addParameter("billdate", row.getString("billdate"));
+        sqlFactory.addParameter("billdate", new Date());
         sqlFactory.addParameter("rebate_userate", row.getBigDecimal("rebate_userate"));
         if (row.getBoolean("rebate_used")) {
             sqlFactory.addParameter("rebate_used", 1);