Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

6 天以前 64264bb278bbfaa8df29f5f19a59d4e8345b04aa

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/SecurityConstant.java

@@ -52,6 +52,11 @@
    String AUTO_CANCEL_ORDER_TIME = "AUTO_CANCEL_ORDER_TIME";

    /**
     * 商户统一分成
     */
    String SHOP_COMMON_PROPORTION = "SHOP_COMMON_PROPORTION";

    /**
     * 自动取消订单时间
     */
    String PAY_MONEY_INTEGRAL = "PAY_MONEY_INTEGRAL";