Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-14 b4d3224898d50b8f1e30b5c8083a520743927282

 oying-common/src/main/java/com/oying/utils/ConstantsKey.java

@@ -2,4 +2,16 @@

public interface ConstantsKey {

    String BUYER = "BUYER";
    String MERCHANT = "MERCHANT";
    String RIDER = "RIDER";
    String ADMIN = "ADMIN";
    String SUPPLIER = "SUPPLIER";
    String AGENT = "AGENT";

    // 退货类型状态 启用
    String RETURN_REASON_STATUS = "1";

    // 用户角色字典key
    String USER_TYPE_BUYER = "USER_TYPE_BUYER";
}