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

@@ -178,7 +178,16 @@
 		
 	</insert>
 	<select id="queryOne" resultType="com.vion.financial.vo.ContractVo" parameterType="java.lang.String">
-		select * from tb_contract where contract_unid = #{contract_unid}
+		select 
+		contract_unid, salesperson_unid, province, city, county, 
+		guarantee_period, sign_date, product_line_type, contract_state, 
+		contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, 
+		cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
+		 is_archive, cast(bad_amount as decimal(18,2)), bad_amount_note, cast(confirm_income_amount as decimal(18,2)),
+		  amount_state_unid, start_guarantee_date, end_guarantee_date,
+		   mainten_start_point, contract_note, is_delete, project_unid, 
+		   customer_unid
+		 from tb_contract where contract_unid = #{contract_unid}
 	</select>
 	<update id="updateOne" parameterType="com.vion.financial.vo.ContractVo">
 		update tb_contract set 

code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectServiceImpl.java

@@ -51,7 +51,7 @@ public class ProjectServiceImpl implements ProjectService {
 			return projectMapper.queryProject();
 		} catch (Exception e) {
 			// TODO: handle exception
-			logger.error("查询合同信息出错"+e.getLocalizedMessage(),e);
+			logger.error("查询项目信息出错"+e.getLocalizedMessage(),e);
 			failCode.setEcode("500");
 			failCode.setEnote("Fail");
 			return failCode;

code/finance_serv/src/main/resources/application.yml

@@ -45,7 +45,8 @@ logging:
 
 finance: 
   authurl: http://192.168.9.162:20080/api/v1/auth/users
-
+  appendsavepath: 
+  appendurl: 
 #pagehelper:
 #    helperDialect: postgresql
 #    reasonable: true