Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/datamodel/FinanceRefund.mk

@@ -82,7 +82,9 @@
 			<attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='refundExplain' columnName='refund_explain' title='退款说明' type='string' default='' precision='' isArray='false'>
  				<annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='300'></annotation>
 			</attribute>
-			
+			<attribute id='f780b924-bf9a-4786-96f1-50e89c26a26c' name='accessory' columnName='accessory' title='附件ID' type='uuid' default='' precision='' isArray='false'>
+ 				<annotation id='8218f944-40c1-468c-85af-530c5188d3ff' attributeId='bfac3d55-b94c-49b9-af31-8a7216f6ceea' name='length' value='undefined'></annotation>
+			</attribute>
 			<hibernate>/xyst.dinas.sales/src/main/resources/config/FinanceRefund.hbm.xml</hibernate>
 		</dataModel>
 	</content>

backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/datamodel/FinanceRefund.jmx

@@ -522,6 +522,25 @@
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>javax.persistence.Column</m:type>
+							<m:properties>
+								<m:property>
+									<m:key>name</m:key>
+									<m:value>accessory</m:value>
+								</m:property>
+							</m:properties>
+						</m:annotation>
+					</m:annotations>
+					<m:id>f780b924-bf9a-4786-96f1-50e89c26a26c</m:id>
+					<m:name>accessory</m:name>
+					<m:title>附件ID</m:title>
+					<m:type>uuid</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
 			</m:attributes>
 		</m:class>
 	</content>

backend/xyst.dinas.finance/src/main/resources/config/FinanceRefund.hbm.xml

@@ -102,6 +102,8 @@
 		<property name="refundExplain" type="nstring" not-null="false">
 			<column name="refund_explain" length="300"></column>
 		</property>
-		
+		<property name="accessory" type="uuid-binary" not-null="false" >
+			<column name="accessory" length="16"></column>
+		</property>
 	</class>
 </hibernate-mapping>
\ No newline at end of file