修改销售计划和临时销售计划的查询元数据

backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlan.mk

@@ -39,7 +39,7 @@
         </ref>
         <description></description>
       </field>
-      <field title='区域公司'>
+      <field title='区域公司id'>
         <name>regionalCompany.id</name>
         <type>uuid</type>
         <ref>
@@ -48,6 +48,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='区域公司'>
+        <name>regionalCompany.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
+        </ref>
+        <description></description>
+      </field>
       <field title='计划周期'>
         <name>planningCycle.id</name>
         <type>uuid</type>

backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlanTemp.mk

@@ -39,7 +39,7 @@
         </ref>
         <description></description>
       </field>
-      <field title='区域公司'>
+      <field title='区域公司id'>
         <name>regionalCompany.id</name>
         <type>uuid</type>
         <ref>
@@ -48,6 +48,15 @@
         </ref>
         <description></description>
       </field>
+      <field title='区域公司'>
+        <name>regionalCompany.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
+        </ref>
+        <description></description>
+      </field>
       <field title='计划周期'>
         <name>planningCycle.id</name>
         <type>uuid</type>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlan.jmx

@@ -48,7 +48,7 @@
 				</m:field>
 				<m:field>
 					<m:name>regionalCompany.id</m:name>
-					<m:title>区域公司</m:title>
+					<m:title>区域公司id</m:title>
 					<m:type>uuid</m:type>
 					<m:ref>
 						<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
@@ -57,6 +57,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>regionalCompany.name</m:name>
+					<m:title>区域公司</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>planningCycle.id</m:name>
 					<m:title>计划周期</m:title>
 					<m:type>uuid</m:type>

backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlanTemp.jmx

@@ -48,7 +48,7 @@
 				</m:field>
 				<m:field>
 					<m:name>regionalCompany.id</m:name>
-					<m:title>区域公司</m:title>
+					<m:title>区域公司id</m:title>
 					<m:type>uuid</m:type>
 					<m:ref>
 						<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
@@ -57,6 +57,16 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>regionalCompany.name</m:name>
+					<m:title>区域公司</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>planningCycle.id</m:name>
 					<m:title>计划周期</m:title>
 					<m:type>uuid</m:type>