shahaibo
|
ca70371585
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
# src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/Product.java
# src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-02-20 10:26:13 +08:00 |
|
shahaibo
|
68f6ae2a8d
|
TASK:design new;
|
2024-02-20 10:12:44 +08:00 |
|
shahaibo
|
4e2e1affa8
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/LibraryService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
# src/main/resources/application-prod.properties
# src/main/resources/application-test.properties
|
2024-02-19 13:02:58 +08:00 |
|
|
|
318d0a1441
|
充值功能--接入支付宝
|
2024-02-14 12:37:57 +08:00 |
|
|
|
874a59ea04
|
Merge remote-tracking branch 'origin/dev/dev_xp' into dev/dev
|
2024-02-14 12:22:16 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
|
|
69fe927576
|
新增generate-queue-dev消息队列
|
2024-01-31 16:01:06 +08:00 |
|
|
|
8f832ec441
|
机器人试用到期提示
|
2024-01-31 14:59:19 +08:00 |
|
|
|
533b54a768
|
MQ 消息队列名修改
|
2024-01-29 17:03:10 +08:00 |
|
shahaibo
|
d4a7fa441c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-26 13:18:37 +08:00 |
|
shahaibo
|
62e6f8b77d
|
TASK:数据迁移;
|
2024-01-26 13:17:59 +08:00 |
|
|
|
c35a188abb
|
TASK:generate 修复逻辑Bug
|
2024-01-25 13:37:17 +08:00 |
|
|
|
65bed9dada
|
TASK:generate 取消generate
|
2024-01-24 16:57:53 +08:00 |
|
|
|
1d2cb17d54
|
TASK:generate 添加队列消费者,增加并发量
|
2024-01-24 14:44:31 +08:00 |
|
|
|
96858c2cc3
|
TASK:异步调用generate及取消generate
|
2024-01-24 11:43:56 +08:00 |
|
|
|
a9ce35200c
|
BUGFIX:测试环境配置修改
|
2024-01-22 16:27:46 +08:00 |
|
|
|
164454b5b2
|
BUGFIX:数据传输过程中long精度发生丢失
|
2024-01-22 16:21:32 +08:00 |
|
|
|
577dc94850
|
1、generate 异步生成及获取排队情况
2、generate 取消生成
|
2024-01-21 14:14:55 +08:00 |
|
shahaibo
|
471426e931
|
TASK:多数据源;
|
2024-01-19 16:36:34 +08:00 |
|
shahaibo
|
ed3dcf9ee8
|
Merge branch 'develop' into dev_shb
|
2024-01-18 13:34:20 +08:00 |
|
shahaibo
|
bccb6d7bd2
|
TASK:免登录;
|
2024-01-18 10:03:48 +08:00 |
|
shahaibo
|
90634f73c7
|
TASK:免密登录;
|
2024-01-17 17:49:40 +08:00 |
|
shahaibo
|
c5d540686e
|
TASK:回退;
|
2024-01-17 10:59:43 +08:00 |
|
shahaibo
|
3452e4c335
|
TASK:回退;
|
2024-01-17 10:57:41 +08:00 |
|
shahaibo
|
5d3657bba2
|
TASK:证书接收测试;
|
2024-01-17 10:52:27 +08:00 |
|
shahaibo
|
393c9ec941
|
TASK:证书接收测试;
|
2024-01-17 10:33:37 +08:00 |
|
shahaibo
|
5678cccde1
|
Merge branch 'develop' into dev_shb
|
2024-01-16 10:51:19 +08:00 |
|
shahaibo
|
8737350002
|
TASK:免密登录;
|
2024-01-15 16:33:23 +08:00 |
|
shahaibo
|
a75cdffe59
|
TASK:design NEW;
|
2024-01-15 15:57:40 +08:00 |
|
shahaibo
|
fc55a775f8
|
TASK:机房免登录测试;
|
2024-01-15 15:08:39 +08:00 |
|
shahaibo
|
62f9bb3795
|
TASK:机房免登录测试;
|
2024-01-15 15:06:48 +08:00 |
|
|
|
474a532f01
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-09 13:54:55 +08:00 |
|
|
|
6fbcab9351
|
添加自定义日志管理,输出到日志文件
|
2024-01-09 13:54:32 +08:00 |
|
shahaibo
|
a3ae8401fb
|
TASK:定时任务执行周期;
|
2024-01-09 13:44:15 +08:00 |
|
shahaibo
|
5bed3c180b
|
TASK:续订通知;
|
2024-01-08 13:02:50 +08:00 |
|
shahaibo
|
11f94ebcb4
|
BUGFIX:element上传;
|
2024-01-04 11:04:15 +08:00 |
|
|
|
d19aa7083b
|
添加状态检测
|
2023-12-29 13:48:42 +08:00 |
|
shahaibo
|
8dd658f1e9
|
BUGFIX: 使用订单通过后的邮件标题,多语言内容更新;
|
2023-12-18 17:18:19 +08:00 |
|
|
|
2de3a73fef
|
BUGFIX:衣服图层添加优先级后对之前数据不兼容的修复-漏提交
|
2023-12-14 15:49:29 +08:00 |
|
shahaibo
|
f80e5ce455
|
TASK: 试用用户添加测试;
|
2023-12-11 15:11:40 +08:00 |
|
shahaibo
|
db1aed53eb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-12-11 14:35:21 +08:00 |
|
shahaibo
|
7fdacaeb7c
|
TASK: 试用用户添加测试;
|
2023-12-11 14:35:05 +08:00 |
|
|
|
cd41229f9e
|
TASK:自动识别上传服装的类别
|
2023-12-11 14:24:28 +08:00 |
|
shahaibo
|
91993feee8
|
TASK: 试用用户添加测试;
|
2023-12-11 10:02:05 +08:00 |
|
shahaibo
|
7bbca01f86
|
TASK: 试用用户添加测试;
|
2023-12-06 16:15:20 +08:00 |
|
shahaibo
|
30ff40e84a
|
TASK: 试用用户添加测试;
|
2023-12-06 15:58:57 +08:00 |
|
shahaibo
|
ecec69a45e
|
TASK: 枚举类多语言;
|
2023-11-23 10:32:33 +08:00 |
|
xupei
|
35e6bb8cd9
|
BUGFIX:取消like后不能再like同一张图片
其他:generate--sketchboard 添加gender
修改generate like的图片命名--当下的十位时间戳
|
2023-11-15 13:22:15 +08:00 |
|
shahaibo
|
6da1286e56
|
BUGFIX: library关联分类;
|
2023-11-13 11:50:45 +08:00 |
|
shahaibo
|
8afec1e962
|
TASK: 多语言;
|
2023-11-09 17:13:33 +08:00 |
|