Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

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

@@ -552,7 +552,7 @@

   // 服务器文件上传配置
   String SAVE_PATH = "/mnt/hive/static/uploadeFile/";
   String SAVE_URL = "http://resource.hive.jyymatrix.cc/uploadeFile/";
   String SAVE_URL = "http://filehive2.jyymatrix.cc/uploadeFile/";


   // 积分规则编号
@@ -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";
}