Merge branch 'feature/pick_car_bug_0517' into feature/20220608BUG

backend/gradle.properties

@@ -14,4 +14,5 @@ publishUsername=
 publishPassword=
 systemProp.sonar.host.url=http://10.2.7.176:9000/sonar
 systemProp.sonar.login=admin
-systemProp.sonar.password=admin
\ No newline at end of file
+systemProp.sonar.password=admin
+mk.eme.path =E:\\eme\\eme\\eme
\ No newline at end of file

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/SelfPickupCar.mk

@@ -111,6 +111,11 @@
         <type>string</type>
         <description></description>
       </field>
+        <field title='合同状态'>
+            <name>contract.contractState</name>
+            <type>string</type>
+            <description></description>
+        </field>
       <field title='合同编号'>
         <name>contract.contractCode</name>
         <type>string</type>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/SelfPickupCar.jmx

@@ -147,6 +147,17 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+                    <m:name>contract.contractState</m:name>
+                    <m:title>合同状态</m:title>
+                    <m:type>string</m:type>
+                    <m:ref>
+                        <m:name></m:name>
+                        <m:type></m:type>
+                    </m:ref>
+                    <m:desc></m:desc>
+                </m:field>
+                <m:field>
+				<m:field>
 					<m:name>contract.contractCode</m:name>
 					<m:title>合同编号</m:title>
 					<m:type>string</m:type>