Merge branch 'test' into dev

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

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;
 }

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

@@ -131,7 +131,7 @@ public class SaleQuotation extends BasePo {
     private String currency;
 
     /**
-     * 币种（字典account_currency）
+     * 客户标签
      */
     private String tag;
 

hx-sale/src/main/java/com/fjhx/sale/service/commission/impl/CommissionServiceImpl.java

@@ -42,8 +42,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     @Override
     public Page<CommissionVo> getPage(CommissionSelectDto dto) {
         QueryWrapper<Object> query = Wrappers.query();
-        query.eq(ObjectUtil.isNotEmpty(dto.getUserId()),"c.user_id",dto.getUserId());
-        query.eq(ObjectUtil.isNotEmpty(dto.getTime()),"DATE_FORMAT(c.create_time,'%Y-%m')",dto.getTime());
+        query.eq(ObjectUtil.isNotEmpty(dto.getUserId()), "c.user_id", dto.getUserId());
+        query.eq(ObjectUtil.isNotEmpty(dto.getTime()), "DATE_FORMAT(c.create_time,'%Y')", dto.getTime());
         query.orderByDesc("c.create_time");
         Page<CommissionVo> page = this.baseMapper.getPage(dto.getPage(), query);
         return page;