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

935090232@qq.com

2021-03-14 b0ee5ab18f8242d0ca81966c07db00e0c6274831

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java

@@ -9,7 +9,7 @@

/**
 * @description 订单表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data