Skip to content

C
cloud-fb
Commit 32c4f2e9 by 高晓磊
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 1c2ac640 85b9a106
Showing with 19 additions and 0 deletions
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlan.mk
...@@ -50,6 +50,15 @@ ...@@ -50,6 +50,15 @@
</ref> </ref>
<description></description> <description></description>
</field> </field>
<field title='计划周期title'>
<name>planningCycle.title</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
</ref>
<description></description>
</field>
<field title='审批时间'> <field title='审批时间'>
<name>approveTime</name> <name>approveTime</name>
<type>datetime</type> <type>datetime</type>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlan.jmx
...@@ -60,6 +60,16 @@ ...@@ -60,6 +60,16 @@
<m:desc></m:desc> <m:desc></m:desc>
</m:field> </m:field>
<m:field> <m:field>
<m:name>planningCycle.title</m:name>
<m:title>计划周期title</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveTime</m:name> <m:name>approveTime</m:name>
<m:title>审批时间</m:title> <m:title>审批时间</m:title>
<m:type>datetime</m:type> <m:type>datetime</m:type>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment