Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 src/main/java/com/ruoyi/project/system/domain/SysDictData.java

@@ -1,7 +1,7 @@
package com.ruoyi.project.system.domain;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import jakarta.validation.constraints.NotBlank;

import jakarta.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.common.constant.UserConstants;