Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r27065 -r27127
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 27065)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 27127)
@@ -148,19 +148,32 @@
       <operation operationId="SSTS_OR_Delete" operationName="����ԤԼɾ��"></operation>
     </modelName>
     
-    <modelName modleName="ʹ�ü�¼ģ��">
-      <operation operationId="SSTS_UseRecord_Create" operationName="ʹ�ü�¼���"></operation>
-      <operation operationId="SSTS_UseRecord_Update" operationName="ʹ�ü�¼�޸�"></operation>
-      <operation operationId="SSTS_UseRecord_Select" operationName="ʹ�ü�¼��ѯ"></operation>
-      <operation operationId="SSTS_UseRecord_Delete" operationName="ʹ�ü�¼ɾ��"></operation>
-      <operation operationId="SSTS_UseRecord_Review" operationName="ʹ�ü�¼���"></operation>
-      <operation operationId="SSTS_UseRecord_Convert" operationName="ʹ�ü�¼ת���뵥"></operation>
+    <modelName modleName="����ʹ�ü�¼ģ��">
+      <operation operationId="SSTS_UseRecord_Create" operationName="���"></operation>
+      <operation operationId="SSTS_UseRecord_Update" operationName="�޸�"></operation>
+      <operation operationId="SSTS_UseRecord_Select" operationName="��ѯ"></operation>
+      <operation operationId="SSTS_UseRecord_Delete" operationName="ɾ��"></operation>
+      <operation operationId="SSTS_UseRecord_Review" operationName="���"></operation>
+      <operation operationId="SSTS_UseRecord_Convert" operationName="ת�����뵥"></operation>
       <operation operationId="SSTS_UseRecord_SeeAll" operationName="�鿴��������ȫ��ʹ�ü�¼"></operation>
       <operation operationId="SSTS_UseRecord_SeeAllDepart" operationName="�鿴���п���ȫ��ʹ�ü�¼"></operation>
-      <operation operationId="SSTS_UseRecord_MergeConvert" operationName="�ϲ�ת��"></operation>
+      <operation operationId="SSTS_UseRecord_MergeConvert" operationName="�ϲ�ת��" mappingConfigPropertyName="enableMultiUseRecordMergeConvert"></operation>
       <operation operationId="SSTS_UseRecord_PriorConvert" operationName="����ת�����뵥" mappingConfigPropertyName="enablePriorConvertApplyGoods"></operation>
     </modelName>
     
+    <modelName mappingConfigPropertyName="enableDepartmentUseRecord" modleName="����ʹ�ü�¼ģ��">
+      <operation operationId="SSTS_DepartmentUseRecord_Create" operationName="���"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_Update" operationName="�޸�"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_Select" operationName="��ѯ"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_Delete" operationName="ɾ��"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_Review" operationName="���"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_Convert" operationName="ת�����뵥"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_SeeAll" operationName="�鿴��������ȫ����¼"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_SeeAllDepart" operationName="�鿴���п���ȫ����¼"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_MergeConvert" operationName="�ϲ�ת��" mappingConfigPropertyName="enableMultiUseRecordMergeConvert"></operation>
+      <operation operationId="SSTS_DepartmentUseRecord_PriorConvert" operationName="����ת�����뵥" mappingConfigPropertyName="enablePriorConvertApplyGoods"></operation>
+    </modelName>
+
     <modelName modleName="�����">
       <operation operationId="SSTS_TousseReturnDisinfect_ViewMenu" operationName="��е������ͼ"></operation>
       <operation operationId="SSTS_TousseReturnDisinfect_Create" operationName="��������"></operation>