Merge branch 'master' into dev

hx-sale/src/main/java/com/fjhx/sale/entity/commission/po/Commission.java

@@ -111,5 +111,33 @@ public class Commission extends BasePo {
      */
     private Integer settlementStatus;
 
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 业务员名称
+     */
+    private String userName;
+
+    /**
+     * 采购金额
+     */
+    private BigDecimal purchaseAmount;
 
+    /**
+     * 合同金额
+     */
+    private BigDecimal contractAmount;
+
+    /**
+     * 销售合同币种
+     */
+    private String contractCurrency;
+
+    /**
+     * 采购合同币种
+     */
+    private String purchaseCurrency;
 }