Commit Graph

29 Commits (effbb7f046008cf56c2e7da4f504bdb43c7e88a6)

Author SHA1 Message Date
yang effbb7f046 modify:积分提醒和清除 2025-01-02 17:14:07 +08:00
yang 5a2b6f8a97 Merge branch 'feature/my-invitation' into preview 2025-01-02 16:18:17 +08:00
yang 1e8197f01a build:调整 2025-01-02 16:17:18 +08:00
Diyu0904 42a4d25a8f Merge branch 'feature/admin' into preview
# Conflicts:
#	mcwl-admin/src/main/resources/application-druid.yml
2025-01-02 16:11:44 +08:00
Diyu0904 c77086a562 修改mybatisplus的配置
新增手机号注册
新增微信扫码注册
2025-01-02 16:09:28 +08:00
yang 7215fcb48e Merge branch 'refs/heads/feature/my-invitation' into preview
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/domain/response/ResponseEnum.java
#	mcwl-common/src/main/java/com/mcwl/common/domain/response/ServerResponseEntity.java
#	mcwl-common/src/main/java/com/mcwl/common/exception/YamiBizException.java
#	mcwl-common/src/main/java/com/mcwl/common/exception/YamiShopBindException.java
#	mcwl-common/src/main/java/com/mcwl/common/i18n/I18nMessage.java
#	mcwl-common/src/main/java/com/mcwl/common/utils/ImageUtil.java
2025-01-02 15:49:11 +08:00
yang 5cc7874b77 refactor:调整 2025-01-02 15:47:03 +08:00
ChenYan 1a1803b991 build:依赖 工具 2025-01-02 14:52:02 +08:00
ChenYan 1f05411e72 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview
# Conflicts:
#	mcwl-admin/src/main/resources/application.yml
2025-01-02 14:21:26 +08:00
ChenYan 76a23fa933 build:依赖 工具 2025-01-02 14:18:31 +08:00
yang 8df1daac3e Merge branch 'refs/heads/feature/my-invitation' into preview
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/utils/ShareCodeUtils.java
2025-01-02 14:13:18 +08:00
yang 1fce665900 feat:会员中心 2025-01-02 14:10:59 +08:00
ChenYan 5f5cc9aa7e build:依赖 工具 2025-01-02 11:44:13 +08:00
ChenYan b778e26fbc build:依赖 工具 2024-12-31 19:05:37 +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
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 c846cbcf50 feat:我的邀请 2024-12-30 15:00:42 +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