Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -690,8 +690,8 @@
 	<select id="queryList" resultType="String">
 	<select id="queryList" resultType="String">
 		select contract_unid from tb_contract where
 		select contract_unid from tb_contract where
 		   is_delete=false
 		   is_delete=false
-		   and project_unid is not null
-		   and customer_unid is not null 
+<!-- 		   and project_unid is  null
+		   and customer_unid is  null  -->
 	</select>
 	</select>
 	<select id="countNumber" resultType="int">
 	<select id="countNumber" resultType="int">
 		select count(contract_unid) from tb_contract where is_delete=false
 		select count(contract_unid) from tb_contract where is_delete=false