conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

 zq-erp/src/main/java/com/matrix/system/score/constant/ScoreSettingConstant.java

@@ -62,10 +62,5 @@
     */

    public final static String EVALUATUIN_ORDER_SHOP = "EVALUATUIN_ORDER_SHOP";

    public final static String EVALUATUIN_ORDER_SHOP_NAME = "评价订单";

    /**

     * 签到

     */

    public final static String SIGN_SHOP = "SIGN_SHOP";

    public final static String SIGN_SHOP_NAME = "签到";



}