Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-24 1998608fb160470b1cd6d139373290986a54b201

 gc-core/src/main/java/com/xzx/gc/entity/ScoreExpressInfo.java

@@ -10,7 +10,7 @@
 **/
@Data
@Table(name = "xzx_score_express_info")
public class ScoreExpressInfo {
public class ScoreExpressInfo extends BaseEntity{

    private String userId;