jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'soybean/main' into dev

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	README.en_US.md
#	README.md
#	package.json
#	pnpm-lock.yaml
#	src/App.vue
#	src/theme/settings.ts
#	src/views/_builtin/iframe-page/[url].vue
This commit is contained in:
xlsea
2025-06-25 11:17:46 +08:00
parent 62e6c7763c 87a675bf62
commit 1680ce4e26
42 changed files with 1234 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/locales/langs/zh-cn.ts
View File

@ -166,7 +166,8 @@ const local: App.I18n.Schema = {
},
watermark: {
visible: '显示全屏水印',
text: '水印文本'
text: '水印文本',
enableUserName: '启用用户名水印'
},
tablePropsTitle: '表格配置',
table: {