Commit Graph

538 Commits

Author SHA1 Message Date
张松 7f169ee677 增加pay配置文件 2024-12-30 22:58:26 +08:00
wangw 4c4c469db2 三方订单号 2024-12-30 22:54:42 +08:00
wangw cc18a05b45 三方订单号 2024-12-30 22:51:09 +08:00
张松 380648395c fix: 达标保存修改 2024-12-30 22:47:15 +08:00
wangw b123a059ce 日志打印 2024-12-30 22:05:13 +08:00
wangw a374f41847 关闭支付 2024-12-30 21:51:32 +08:00
Tankaikai e4ae8beb77 Merge remote-tracking branch 'origin/test' into test 2024-12-30 21:49:29 +08:00
谭凯凯 7cb257317c 首页查询优化 2024-12-30 21:49:23 +08:00
wangw 09a0cf09e4 根据id查询短剧详情 2024-12-30 21:43:05 +08:00
wangw 0aed96e92e 日志打印 2024-12-30 21:29:20 +08:00
wangw 435421be0a 子查询 以及 扫描路径 2024-12-30 21:21:49 +08:00
张松 d496efb196 fix: 拦截器增加异步 2024-12-30 21:17:56 +08:00
张松 649f8f0c3f refactor: 更改子查询为join 2024-12-30 21:04:18 +08:00
张松 ddb1c196b3 Merge remote-tracking branch 'origin/test' into test 2024-12-30 20:58:14 +08:00
张松 51e1db2bc4 refactor: 更改子查询为join 2024-12-30 20:58:05 +08:00
Tankaikai a22229b3df Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/resources/mapper/course/CourseDao.xml
2024-12-30 20:24:52 +08:00
谭凯凯 e5af376cae 分库不支持子查询修改为关联查询 2024-12-30 20:22:49 +08:00
张松 c4852d5e7e refactor: 更改子查询为join 2024-12-30 20:15:43 +08:00
张松 940f41930f refactor: 更改子查询为join 2024-12-30 20:08:39 +08:00
张松 6828c78114 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/resources/mapper/course/CourseDao.xml
2024-12-30 20:06:15 +08:00
张松 e2ae91bcd6 refactor: 更改子查询为join 2024-12-30 20:05:04 +08:00
GYJ 808a5f9ce6 Merge remote-tracking branch 'origin/test' into test 2024-12-30 19:21:28 +08:00
GYJ 4355b9f292 sql 报错 2 2024-12-30 19:21:19 +08:00
wangw 52efab0331 意见反馈 2024-12-30 19:12:15 +08:00
wangw 315a341e41 提现次数/金额 2024-12-30 19:08:39 +08:00
谭凯凯 6f1e9e34df 修复无法返回videoUrl的bug 2024-12-30 19:02:01 +08:00
谭凯凯 0223eccd04 首页查询优化 2024-12-30 18:45:50 +08:00
Tankaikai dd59c4577e Merge remote-tracking branch 'origin/test' into test 2024-12-30 18:30:45 +08:00
谭凯凯 291b8e2646 修复无法返回videoUrl的bug 2024-12-30 18:30:39 +08:00
张松 379a6f81e0 Merge remote-tracking branch 'origin/test' into test 2024-12-30 18:28:25 +08:00
张松 99dba02361 feat: 定时任务调用修改 2024-12-30 18:28:17 +08:00
wangw f154973d2d 日期问题 2024-12-30 18:26:40 +08:00
wangw d3241cf504 日志打印 2024-12-30 18:26:10 +08:00
张松 91a1154383 feat: 定时任务调用修改 2024-12-30 18:23:21 +08:00
GYJ 5e06231aaa sql 报错 2024-12-30 18:16:59 +08:00
GYJ 7498922675 查询日期补全方法 2024-12-30 17:55:09 +08:00
张松 e0e53bfd9a feat: 增加根据beanName及方法调用接口 2024-12-30 17:48:28 +08:00
谭凯凯 c677d75feb 首页查询优化 2024-12-30 17:23:27 +08:00
谭凯凯 f8df78b065 首页查询优化 2024-12-30 17:16:08 +08:00
Tankaikai afcb0abc6a Merge remote-tracking branch 'origin/test' into test 2024-12-30 16:47:29 +08:00
谭凯凯 b45006d2f7 首页查询优化 2024-12-30 16:47:23 +08:00
张松 2fc1f1e61c Merge remote-tracking branch 'origin/test' into test 2024-12-30 16:44:35 +08:00
张松 4c1310c089 feat: InviteAchievementMapper字段調整 2024-12-30 16:44:24 +08:00
wangw 769e476b23 请求日志 异步打印 2024-12-30 16:42:32 +08:00
wangw b2eb085472 dev 配置文件 2024-12-30 16:40:14 +08:00
wangw adf0b74627 Merge remote-tracking branch 'origin/test' into test 2024-12-30 16:32:57 +08:00
张松 d475f34a0a Merge remote-tracking branch 'origin/test' into test 2024-12-30 16:31:27 +08:00
张松 95f4a1aab0 feat: 达标奖励查询方式修改 2024-12-30 16:31:11 +08:00
wangw 9bb24f0aba Merge branch 'sharding' into test
# Conflicts:
#	src/main/java/com/sqx/SqxApplication.java
#	src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
#	src/main/resources/mapper/course/CourseDao.xml
2024-12-30 16:30:04 +08:00
wangw 257bc9e760 云购os移除 2024-12-30 16:23:51 +08:00