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

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

@@ -658,7 +658,7 @@ public class OrderItemsHelper extends BaseClass {
         //牌价、市场价（元）,标准订单牌价取商品价格，项目订单取合同里的牌价
         insertSQL.setValue("marketprice", marketprice);
 
-        insertSQL.setValue("length", width);
+        insertSQL.setValue("width", width);
 
         insertSQL.setValue("length", length);