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

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -536,6 +536,9 @@ public class ChangeOrderLogic {
             AdminWebsit adminWebsit = adminWebsitMap.get(websitId);
             Region region = orderBaseLogic.getRegion(pName, cName, aName, sName);
 
+            if (region == null)
+             throw new RemoteServiceException(pName+cName+aName+sName+"该地址查找不到");
+
             for (String sales : salesNames) {
                 SysDictCompany saleOne = salesMap.get(sales);
                 for (String small : smallNames) {