Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2177

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java

@@ -87,7 +87,7 @@ class ActionCreate extends BaseAction {
 		private static final long serialVersionUID = -6314932919066148113L;
 
 		static WrapCopier<Wi, Unit> copier = WrapCopierFactory.wi(Wi.class, Unit.class, null,
-				ListTools.toList(JpaObject.FieldsUnmodify, Unit.superior_FIELDNAME, Unit.pinyin_FIELDNAME,
+				ListTools.toList(JpaObject.FieldsUnmodify, Unit.pinyin_FIELDNAME,
 						Unit.pinyinInitial_FIELDNAME, Unit.level_FIELDNAME, Unit.levelName_FIELDNAME,
 						Unit.inheritedControllerList_FIELDNAME));
 	}

o2web/source/x_desktop/js/base.js

@@ -432,8 +432,8 @@ o2.addReady(function () {
             layout.config.app_protocol = window.location.protocol;
         }
 
-        if (layout.config.configMapping && layout.config.configMapping[window.location.host]){
-            var mapping = layout.config.configMapping[window.location.host];
+        if (layout.config.configMapping && (layout.config.configMapping[window.location.host] || layout.config.configMapping[window.location.hostname])){
+            var mapping = layout.config.configMapping[window.location.host] || layout.config.configMapping[window.location.hostname];
             if (mapping.servers){
                 layout.serviceAddressList = mapping.servers;
                 layout.desktop.serviceAddressList = mapping.servers;