Commit Graph

531 Commits (master)

Author SHA1 Message Date
ChenYan e35045b1c8 Merge branch 'master' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource
# Conflicts:
#	mcwl-admin/pom.xml
2024-12-31 16:15:51 +08:00
ChenYan 12b00c70ed Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai 2024-12-31 16:12:50 +08:00
ChenYan 9d5cf6040d Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview
# Conflicts:
#	mcwl-admin/pom.xml
2024-12-31 16:09:18 +08:00
ChenYan 2b5c7e1f20 build:依赖 工具 2024-12-31 15:59:15 +08:00
yang 37b0e80892 chore:配置文件调整 2024-12-31 15:12:59 +08:00
yang 10b3a4b0b3 Merge branch 'feature/my-invitation' into preview 2024-12-31 15:06:15 +08:00
yang a18a478b36 style:调整 2024-12-31 15:05:15 +08:00
Diyu0904 fe00aae291 Merge branch 'feature/admin' into preview
# Conflicts:
#	mcwl-admin/src/main/resources/application-druid.yml
2024-12-31 14:59:35 +08:00
Diyu0904 4fe40b47fb 新增mybatis-plus
新增微信扫码登录
优化发送验证码逻辑
2024-12-31 14:56:32 +08:00
yang 10d944174d style:调整 2024-12-30 17:20:20 +08:00
ChenYan 1f84a178b0 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource 2024-12-30 17:17:51 +08:00
ChenYan 5e249417f9 docs:仅文档更改 2024-12-30 17:16:47 +08:00
yang 6ebed7b289 Merge branch 'feature/my-invitation' into preview 2024-12-30 17:09:30 +08:00
yang 13e5bf5bae docs:添加mybatis-plus配置 2024-12-30 17:07:27 +08:00
Diyu0904 a0c6c39c03 Merge branch 'feature/admin' into preview 2024-12-30 16:55:05 +08:00
Diyu0904 200d7b8106 新增短信工具类
新增自定义异常类
新增手机号登录
2024-12-30 16:52:24 +08:00
yang 8f80a6ea4f Merge branch 'feature/my-invitation' of https://gitea.qinmian.online/CY/mcwl-ai into preview
# Conflicts:
#	pom.xml
2024-12-30 15:03:19 +08:00
yang c846cbcf50 feat:我的邀请 2024-12-30 15:00:42 +08:00
ChenYan 8e330577ee build: 2024-12-30 14:51:23 +08:00
ChenYan 04f0d884f0 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai 2024-12-30 14:49:14 +08:00
ChenYan cb923c32f8 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2024-12-30 14:48:20 +08:00
ChenYan dee5eb0518 build: 工具 2024-12-30 14:47:34 +08:00
ChenYan 3785ce626c Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2024-12-30 11:43:03 +08:00
ChenYan c1aa8aaeb1 build: 工具 2024-12-30 11:38:22 +08:00
ChenYan db0cee24e1 chore: 工具 2024-12-30 11:28:25 +08:00
ChenYan 4aa6c6250a docs: 文件 2024-12-28 18:52:42 +08:00
ChenYan 3f69d8466b docs: 文件 2024-12-28 18:51:17 +08:00
ChenYan a998c414bd build: 依赖 2024-12-28 18:43:30 +08:00
ChenYan cf6a7b2047 feat: 工具类 2024-12-28 16:43:59 +08:00
ChenYan 1c93d5b555 feat:项目1.11 2024-12-28 13:12:46 +08:00
ChenYan 006c7004ba feat:项目 2024-12-27 19:19:47 +08:00