From d4d04a5515e061110e3c4d183d35fb9c021d041a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=A5=A5=E7=86=A0?= <caixiangyi@zoneland.net>
Date: Tue, 1 Mar 2022 07:34:25 +0000
Subject: [PATCH] Merge branch 'hotfix/api' into 'master'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge of hotfix/api 修复api职务描述不正确的问题 to master

See merge request o2oa/o2oa!323

(cherry picked from commit c6fc749ddc8b2cd88e379d072510fa4d8ee9f1ba)

2012fdaa 修复api的问题
---
 o2web/source/x_desktop/js/initialScriptText.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/o2web/source/x_desktop/js/initialScriptText.js b/o2web/source/x_desktop/js/initialScriptText.js
index e60e1ff242..6b23df3493 100644
--- a/o2web/source/x_desktop/js/initialScriptText.js
+++ b/o2web/source/x_desktop/js/initialScriptText.js
@@ -1407,7 +1407,7 @@ bind.org = {
      * @static
      * @param {UnitFlag|UnitFlag[]} unit - 组织的distinguishedName、name、id、unique属性值，组织对象，或上述属性值和对象的数组。
      * @return {Object[]} 返回职务数组
-     * @o2ActionOut x_organization_assemble_express.UnitDutyAction.listWithUnitObject|example=UnitDuty
+     * @o2ActionOut x_organization_assemble_express.UnitDutyAction.listWithUnitObject|example=Duty
      * @o2syntax
      * //返回职务数组。
      * var dutyList = this.org.listUnitAllDuty( unit );
-- 
GitLab