hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 08:25:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17

Browse Source
This commit is contained in:
YunaiV
2024-09-07 08:47:56 +08:00
parent 2759a32331 15f46db7ac
commit 30fd7996f6
71 changed files with 1624 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java
View File

@ -91,7 +91,7 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
* 开启 VirtualStyle 模式
*/
private void enableVirtualStyleEndpoint() {
if (StrUtil.containsAll(config.getEndpoint(),
if (StrUtil.containsAny(config.getEndpoint(),
S3FileClientConfig.ENDPOINT_TENCENT, // 腾讯云 https://cloud.tencent.com/document/product/436/41284
S3FileClientConfig.ENDPOINT_VOLCES)) { // 火山云 https://www.volcengine.com/docs/6349/1288493
client.enableVirtualStyleEndpoint();

1
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm
View File

@ -286,6 +286,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
// 校验存在
validate${subSimpleClassName}Exists(${subClassNameVar}.getId());
// 更新
${subClassNameVar}.setUpdater(null).setUpdateTime(null); // 解决更新情况下：updateTime 不更新
${subClassNameVars.get($index)}Mapper.updateById(${subClassNameVar});
}

11
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm
View File

@ -64,12 +64,11 @@
<el-checkbox
v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-checkbox>
:label="dict.label"
:value="dict.value"
/>
#else##没数据字典
<el-checkbox>请选择字典生成</el-checkbox>
<el-checkbox label="请选择字典生成" />
#end
</el-checkbox-group>
</el-form-item>
@ -85,7 +84,7 @@
{{ dict.label }}
</el-radio>
#else##没数据字典
<el-radio label="1">请选择字典生成</el-radio>
<el-radio value="1">请选择字典生成</el-radio>
#end
</el-radio-group>
</el-form-item>

22
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
View File

@ -92,12 +92,11 @@
<el-checkbox
v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-checkbox>
:label="dict.label"
:value="dict.value"
/>
#else##没数据字典
<el-checkbox>请选择字典生成</el-checkbox>
<el-checkbox label="请选择字典生成" />
#end
</el-checkbox-group>
</el-form-item>
@ -117,7 +116,7 @@
{{ dict.label }}
</el-radio>
#else##没数据字典
<el-radio label="1">请选择字典生成</el-radio>
<el-radio value="1">请选择字典生成</el-radio>
#end
</el-radio-group>
</el-form-item>
@ -219,12 +218,11 @@
<el-checkbox
v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-checkbox>
:label="dict.label"
:value="dict.value"
/>
#else##没数据字典
<el-checkbox>请选择字典生成</el-checkbox>
<el-checkbox label="请选择字典生成" />
#end
</el-checkbox-group>
</el-form-item>
@ -240,7 +238,7 @@
{{ dict.label }}
</el-radio>
#else##没数据字典
<el-radio label="1">请选择字典生成</el-radio>
<el-radio value="1">请选择字典生成</el-radio>
#end
</el-radio-group>
</el-form-item>

11
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
View File

@ -75,12 +75,11 @@
<el-checkbox
v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-checkbox>
:label="dict.label"
:value="dict.value"
/>
#else##没数据字典
<el-checkbox>请选择字典生成</el-checkbox>
<el-checkbox label="请选择字典生成" />
#end
</el-checkbox-group>
</el-form-item>
@ -96,7 +95,7 @@
{{ dict.label }}
</el-radio>
#else##没数据字典
<el-radio label="1">请选择字典生成</el-radio>
<el-radio value="1">请选择字典生成</el-radio>
#end
</el-radio-group>
</el-form-item>