Merge branch 'develop' into develop2

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

@@ -775,7 +775,10 @@ public class OrderItemsHelper extends BaseClass {
             case "标准订单":
                 if(siteid.equalsIgnoreCase("ccyosg")){
                     if(itemPrice.getQinminPrice().compareTo(BigDecimal.ZERO)>0){
-                        price = itemPrice.getQinminPrice();
+                        if(itemPrice.getGraderateprice().compareTo(itemPrice.getQinminPrice())>0){
+
+                        }
+                        price = (itemPrice.getGraderateprice().compareTo(itemPrice.getQinminPrice())<0)?itemPrice.getGraderateprice():itemPrice.getQinminPrice();
                         item.put("remarks","亲民价;"+item.getStringValue("remarks"));
                     }else{
                         price = itemPrice.getGraderateprice();