Merge branch 'dev' into master

# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/resources/bootstrap.yml

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java

@@ -238,4 +238,8 @@ public class ReconciliationPO extends BaseVOEntity{
     @ApiModelProperty(value = "nc唯一标识")
     private String skNcId;
 
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
 }

mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java

@@ -115,4 +115,7 @@ public class TmsReceipt extends BaseVOEntity{
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private java.util.Date synchronousTime;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
 }

mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/po/TmsReceiptPO.java

@@ -107,4 +107,6 @@ public class TmsReceiptPO extends BaseVOEntity{
     @ApiModelProperty("组织名称")
     @Excel(name = "组织名称")
     private String organizationName;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }

mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/todo/TmsReceiptDO.java

@@ -132,4 +132,6 @@ public class TmsReceiptDO extends BaseVOEntity{
     @ApiModelProperty("收款单号")
     @Excel(name = "收款单号")
     private String receivePaymentNumber;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }