BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !556 from BladeX/master

Merge pull request !557 from 杜继强/master

Merge pull request !558 from 马铃薯头/master

Merge pull request !559 from 账号已删除/N/A

Merge pull request !561 from 天天写BUG/master

fix:修复创建新租户，由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误，插入失败

Signed-off-by: 天天写BUG <decan_zheng@foxmail.com>

FTP传输模式文字错误

Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>

Merge pull request !552 from ZJY/fix_redisCache

Merge pull request !553 from dhb52/N/A

Signed-off-by: dhb52 <dhb52@126.com>

Merge pull request !550 from 芋道源码/feature/mall_product

Merge pull request !548 from 芋道源码/master-redis

 Conflicts:
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java

Merge pull request !547 from wcz/master

Merge pull request !546 from dhb52/master