Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

Browse Source

# Conflicts:
#	yudao-gateway/Dockerfile
#	yudao-module-ai/yudao-module-ai-server/Dockerfile
#	yudao-module-bpm/yudao-module-bpm-server/Dockerfile
#	yudao-module-crm/yudao-module-crm-server/Dockerfile
#	yudao-module-erp/yudao-module-erp-server/Dockerfile
#	yudao-module-im/yudao-module-im-server/Dockerfile
#	yudao-module-infra/yudao-module-infra-server/Dockerfile
#	yudao-module-mall/yudao-module-product-server/Dockerfile
#	yudao-module-mall/yudao-module-promotion-server/Dockerfile
#	yudao-module-mall/yudao-module-statistics-server/Dockerfile
#	yudao-module-mall/yudao-module-trade-server/Dockerfile
#	yudao-module-member/yudao-module-member-server/Dockerfile
#	yudao-module-mes/yudao-module-mes-server/Dockerfile
#	yudao-module-mp/yudao-module-mp-server/Dockerfile
#	yudao-module-pay/yudao-module-pay-server/Dockerfile
#	yudao-module-pay/yudao-module-pay-server/src/test/resources/application-unit-test.yaml
#	yudao-module-report/yudao-module-report-server/Dockerfile
#	yudao-module-system/yudao-module-system-server/Dockerfile
#	yudao-module-wms/yudao-module-wms-server/Dockerfile
#	yudao-server/Dockerfile

...

This commit is contained in:

YunaiV

2026-10-05 21:09:59 +08:00

parent 2d967e7d2d 0dfc386658

commit 4d15293af5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available