Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java

@@ -45,6 +45,12 @@
    String IS_OVERTIME_YES = "1";

    /**
     * 是否有效 1-有效 0-无效
     */
    String IS_VALID_YES = "1";
    String IS_VALID_NO = "0";

    /**
     * 订单来源： 1-平台派单 2-骑手抢单 3-商家直派 4-其他
     */
    String ORDER_SOURCE_PLATFORM = "1";