Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java

@@ -7,8 +7,8 @@

/**
 * @description 订单结算记录
 * @author jyy
 * @date 2021-03-10 15:22
 * @author yourName
 * @date 2021-03-10 17:34
 */
@Data
@TableName("shop_saleman_settlement")