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

xiaoyong931011

2021-07-16 cf8e5b5cc0f781a44d66d0c8d361fec049fd4008

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

@@ -37,5 +37,12 @@
    public  static final Integer STATUS_EVALUATE = 5;
    public  static final Integer STATUS_CANCEL = 6;

    /**
     * 后台确认提货  1：是  2：否
     */
    private Integer isFinish;
    public  static final Integer ISFINISH_YES = 1;
    public  static final Integer ISFINISH_NO = 2;

    private String remark;
}