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

jyy

2021-03-12 baa79615425b71521e67ec8a9344b88ce53fc5de

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

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

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