Merge branch 'develop' into develop2

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

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