Merge remote-tracking branch 'origin/score_shop' into develop

jiangyouyao

2022-04-06 143acd2312a766f39c75b82bce5a32412b863825

 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";
}