Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

buhuazhen

2026-05-28 08553c034773008ba68b7b6709683b385610ee4f

 src/main/java/com/ruoyi/common/enums/BaseEnum.java

@@ -1,6 +1,7 @@
package com.ruoyi.common.enums;


import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;