Merge branch 'test'

Browse Source

# Conflicts:
#	pom.xml
#	sql/dm/ruoyi-vue-pro-dm8.sql
#	sql/tools/convertor.py
#	yudao-framework/yudao-spring-boot-starter-biz-business/src/main/java/cn/iocoder/yudao/framework/business/core/db/BusinessBaseDO.java
#	yudao-module-crm/yudao-module-crm-server/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
#	yudao-module-iot/yudao-module-iot-biz/src/main/resources/application-dev.yaml
#	yudao-module-member/yudao-module-member-server/src/main/resources/application-dev.yaml

...

This commit is contained in:

chenbowen

2025-07-03 11:47:57 +08:00

parent aa32db5c11 6575e92757

commit bde95cdfa4

18 changed files with 2709 additions and 85 deletions

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

430

sql/mysql/ai.sql Normal file

File diff suppressed because one or more lines are too long

508

sql/mysql/bpm.sql Normal file

File diff suppressed because one or more lines are too long

605

sql/mysql/crm.sql Normal file

File diff suppressed because one or more lines are too long

1072

sql/mysql/erp.sql Normal file

File diff suppressed because it is too large Load Diff