Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -110,19 +110,6 @@
    public static final String SAFEPATH = "/su";

    public static final String TOKEN_KEY = "token";
    /**
     * 保存在cookie 中的token
     */
    public static final String USER_TOKEN_COOKIE = "token";
    public static final String COOKIE_TIME_OUT = "cookie_time_out";
    /**
     * nginx访问地址
     */
    public static final String NGINX_URL = "static_resource_url";
    /**
     * 存储路径
     */
    public static final String FILES_TORAGE_PATH = "file_storage_path";

    /**
     * 过滤特殊字符
@@ -521,7 +508,7 @@
    /**
     * 免免邮金额
     */
    public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
        public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";


    /**
@@ -578,7 +565,33 @@
     */
    public static final String SHOP_MANAGE_JJCPAS_CONSUME = "shopManageJjcpasConsume";

    /**
     * 门店是否只能取消待付款订单,服务单
     */
    public static final String SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER = "shopManageAbleCancelDfkOrder";
    /**
     * 服务记录跟进模板
     */
    public static final String SERVICE_FLOW_TEMPLATE = "SERVICE_FLOW_TEMPLATE";
    /**
     * 开启短信提醒
     */
    public static final String OPEN_SMS_NOTICE = "OPEN_SMS_NOTICE";

    /**
     * 服务单自动配料
     */
    public static final String OPEN_SERVICE_ORDER_AUTO_BATCHING = "OPEN_SERVICE_ORDER_AUTO_BATCHING";

    /**
     * 赠送金额购买产品算赠送购买
     */
    public static final String SHOP_MANAGE_GIFTISFREE = "shopManageGiftisfree";

    /**
     * 钉钉通知token
     */
    public static final String WX_ORDER_NOTICE_DINGDING_TOKEN = "wxOrderNoticeDingdingToken";