Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_善鼎通讯_pro

yuan

2026-05-14 4eb1118aa7e9fe3096fa029f19eba21eb25242d9

 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;