Merge branch 'developer' into alpha

Helius

2022-03-14 938d37e96dc00f8fc3c7036d818e87d51624e0a9

 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 = "签到";



}