Merge branch 'hotfix/cms_miss_a_xaction' into 'master'

Merge of hotfix/[内容管理]修复内容管理打开栏目设置界面报错的问题

See merge request o2oa/o2oa!191

o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.json

@@ -5,6 +5,7 @@
   "getCMSApplication": {"uri": "/jaxrs/appinfo/{id}"},
 
   "listAllAppType" : {"uri":"/jaxrs/appinfo/list/appType"},
+  "listAllAppTypeByManager" : {"uri":"/jaxrs/appinfo/list/appType/manager"},
   "listWhatICanManageWithAppType" : {"uri":"/jaxrs/appinfo/list/manage/type/{appType}"},
   "listWhatICanViewWithAppType" : {"uri":"/jaxrs/appinfo/list/user/view/all/type/{appType}"},