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

xin

2025-07-16 0526acc407572d23b1030e0ffd842406ae0bc121

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

@@ -8,11 +8,12 @@
public enum MerchantRole {

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

    private final String role;
    private final Integer level;
    private final String desc;
}