Merge branch 'prod/20260407' into test

# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java
This commit is contained in:
曹鹏飞 2026-04-13 15:58:05 +08:00
commit 2e9fb96df6
1 changed files with 1 additions and 4 deletions

View File

@ -18,10 +18,7 @@ import com.nflg.mobilebroken.common.pojo.request.SaveDictionaryRequest;
import com.nflg.mobilebroken.common.pojo.vo.DictionaryItemTranslateVO; import com.nflg.mobilebroken.common.pojo.vo.DictionaryItemTranslateVO;
import com.nflg.mobilebroken.common.pojo.vo.DictionaryItemVO; import com.nflg.mobilebroken.common.pojo.vo.DictionaryItemVO;
import com.nflg.mobilebroken.common.pojo.vo.DictionaryVO; import com.nflg.mobilebroken.common.pojo.vo.DictionaryVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.*;
import com.nflg.mobilebroken.common.util.EecExcelUtil;
import com.nflg.mobilebroken.common.util.PageUtil;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.DictionaryItem; import com.nflg.mobilebroken.repository.entity.DictionaryItem;
import com.nflg.mobilebroken.repository.entity.DictionaryItemTranslate; import com.nflg.mobilebroken.repository.entity.DictionaryItemTranslate;
import com.nflg.mobilebroken.repository.entity.Language; import com.nflg.mobilebroken.repository.entity.Language;