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

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

 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