Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

 oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java

@@ -8,10 +8,9 @@
public enum MerchantRole {

    // 商户角色
    OWNER("OWNER", 1,"所有者"),
    ADMIN("ADMIN", 2,"管理员"),
    FINANCE("FINANCE", 3,"财务"),
    OPERATOR("OPERATOR", 4,"操作员");
    ADMIN("ADMIN", 1,"管理员"),
    FINANCE("FINANCE", 2,"财务"),
    OPERATOR("OPERATOR", 3,"操作员");

    private final String role;
    private final Integer level;