Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/FeesDesc.java

@@ -55,6 +55,11 @@ public class FeesDesc implements Serializable {
 	@ApiModelProperty(value = "费用名称")
 	private String cname;
 	/**
+	 * 英文名称
+	 */
+	@ApiModelProperty(value = "英文名称")
+	private String ename;
+	/**
 	 * 币别
 	 */
 	@ApiModelProperty(value = "币别")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderFees.java

@@ -169,6 +169,12 @@ public class OrderFees implements Serializable {
 	@TableField(exist = false)
 	private String feeName;
 	/**
+	 * 费用名称
+	 */
+	@ApiModelProperty(value = "费用名称")
+	@TableField(exist = false)
+	private String ename;
+	/**
 	 * 支付方名称
 	 */
 	@ApiModelProperty(value = "支付方名称")

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderFees.java

@@ -155,6 +155,12 @@ public class OrderFees extends OrderBase {
 	@TableField(exist = false)
 	private String feeName;
 	/**
+	 * 费用名称
+	 */
+	@ApiModelProperty(value = "费用名称")
+	@TableField(exist = false)
+	private String ename;
+	/**
 	 * 支付方名称
 	 */
 	@ApiModelProperty(value = "支付方名称")

blade-service/blade-client/src/main/java/org/springblade/client/fees/mapper/FeesDescMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="cname" property="cname"/>
+        <result column="ename" property="ename"/>
         <result column="fcyno" property="fcyno"/>
         <result column="unitno" property="unitno"/>
         <result column="dc" property="dc"/>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderFeesServiceImpl.java

@@ -94,6 +94,7 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
 					if (feesDescR.isSuccess() && feesDescR.getData() != null){
 						item.setCode(feesDescR.getData().getCode());
 						item.setFeeName(feesDescR.getData().getCname());
+						item.setEname(feesDescR.getData().getEname());
 					}
 				}
 				//获取客户名称

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -664,6 +664,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (feesDescR.isSuccess() && feesDescR.getData() != null) {
 						item.setCode(feesDescR.getData().getCode());
 						item.setFeeName(feesDescR.getData().getCname());
+						item.setEname(feesDescR.getData().getEname());
 					}
 					//获取客户名称
 					if (item.getCorpId() != null) {