GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xlsea 2025-07-01 10:09:53 +08:00
commit 53fa87dae2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/template/modules/operate-drawer.vue.vm vendored
View File

@ -52,7 +52,7 @@ function createDefaultModel(): Model {
return {
#foreach($column in $columns)
#if($column.insert)
${column.javaField}:#if($column.javaType == 'String' && $!column.dictType && $column.dictType == '') ''#else undefined#end#if($foreach.hasNext),#end
${column.javaField}:#if($column.javaType == 'String' || ($!column.dictType && $column.dictType != '')) ''#else undefined#end#if($foreach.hasNext),#end
#end
#end
};

2
src/views/system/dept/modules/dept-search.vue
View File

@ -17,7 +17,7 @@ const { formRef, validate, restoreValidation } = useNaiveForm();
const model = defineModel<Api.System.DeptSearchParams>('model', { required: true });
const { options: sysNormalDisableOptions } = useDict('sys_normal_disable');
const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false);
async function reset() {
await restoreValidation();