Merge branch 'score_shop' into api_score_meger

jyy

2021-06-19 e522e4d40451b4e46ec79b3d8a3891899196f14f

 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java

@@ -572,4 +572,5 @@

    String SERVICE_OVER_BEGIN_END = "SERVICE_OVER_BEGIN_END";
    String SALE_MAN_IS_CONSUME_ACHIEVE = "SALE_MAN_IS_CONSUME_ACHIEVE";
    String ZS_CONSUME_ACHIEVE = "ZS_CONSUME_ACHIEVE";
}