zhoumingfa 23c4889723 Merge remote-tracking branch 'origin/master' ... # Conflicts: # smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue # smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue		2025-03-31 23:37:57 +08:00
..
src/main	Merge remote-tracking branch 'origin/master'	2025-03-31 23:37:57 +08:00
pom.xml	v3.14.0 更新；【新增】EasyExcel重磅升级为FastExcel;【新增】使用最强Argon2算法作为密码存储;【新增】大家吐槽的数据字典改为可重复;【新增】前端布局再增加多种样式;【优化】升级SaToken到最新版本;【优化】token使用Sa-Token的Bearer类型；【优化】优化其他	2025-03-12 20:17:39 +08:00