Merge branch 'develop-green' into develop2

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

@@ -2227,10 +2227,10 @@ public class Order extends Controller {
         if (!StringUtils.isBlank(row.getString("submitdate"))) {
             submitdate = row.getDate("submitdate");
         }
-        if (!row.getString("type").equals("标准订单")) {
+        if (!row.getString("type").equals("标准订单") && siteid.equalsIgnoreCase("ccyosg")) {
             return getErrReturnObject().setErrMsg("非标准订单无法退回").toString();
         }
-        if (!isMonth(submitdate, date) && row.getString("type").equals("标准订单")) {
+        if (!isMonth(submitdate, date) && row.getString("type").equals("标准订单") && siteid.equalsIgnoreCase("ccyosg")) {
             return getErrReturnObject().setErrMsg("标准订单无法跨月退回").toString();
         }