shahaibo
|
314ad7a4f8
|
TASK:定时任务开启
|
2024-07-09 23:46:54 +08:00 |
|
shahaibo
|
a56510c35a
|
TASK:变回develop环境
|
2024-07-09 23:44:40 +08:00 |
|
shahaibo
|
c2e2140ce6
|
Merge branch 'test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-07-09 23:40:58 +08:00 |
|
|
|
83915d332f
|
Merge branch 'dev/dev' into test/stable
|
2024-07-09 17:30:54 +08:00 |
|
|
|
751aeb785d
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-07-09 17:29:42 +08:00 |
|
|
|
7cadab9345
|
付费用户邮件通知
|
2024-07-09 17:28:38 +08:00 |
|
shahaibo
|
4c598200e5
|
TASK:邮件通知
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
d052918725
|
BUGFIX:t_design_item_detail_print level2type;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
8fd6a3462e
|
BUGFIX:颜色没返回;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
11eb6595dd
|
BUGFIX:游客注册主题;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
0adfcb745d
|
BUGFIX:喜欢的作品;
|
2024-07-09 17:10:50 +08:00 |
|
shahaibo
|
779e1e8be3
|
BUGFIX:like;
|
2024-07-09 17:10:49 +08:00 |
|
shahaibo
|
5297880c3b
|
BUGFIX:aida;
|
2024-07-09 17:10:49 +08:00 |
|
shahaibo
|
2ed63cafd0
|
TASK:生产消费暂时关闭;
|
2024-07-09 11:44:18 +08:00 |
|
shahaibo
|
2d6867b729
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-07-09 09:46:54 +08:00 |
|
shahaibo
|
0b8d0a1843
|
BUGFIX:aida;
|
2024-07-09 09:46:41 +08:00 |
|
|
|
64c7b8c1fd
|
机器人 total_cast 上限调整
|
2024-07-08 19:05:38 +08:00 |
|
shahaibo
|
42f1d47f82
|
BUGFIX:aida;
|
2024-07-08 16:17:13 +08:00 |
|
shahaibo
|
9ca0cd7c43
|
BUGFIX:aida;
|
2024-07-08 15:24:50 +08:00 |
|
shahaibo
|
4c187d1fbd
|
BUGFIX:aida;
|
2024-07-08 14:42:59 +08:00 |
|
shahaibo
|
733de89883
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-07-08 09:32:54 +08:00 |
|
shahaibo
|
0e1a5a70df
|
BUGFIX:aida;
|
2024-07-08 09:31:42 +08:00 |
|
|
|
5ecebd5117
|
修改印花 允许同时single和overall
|
2024-07-05 18:47:12 +08:00 |
|
|
|
c6626b230a
|
Merge branch 'dev/dev' into dev/dev_xp
|
2024-07-05 18:42:03 +08:00 |
|
shahaibo
|
1cab7332f9
|
BUGFIX:aida;
|
2024-07-05 16:52:56 +08:00 |
|
shahaibo
|
c1d88943a9
|
BUGFIX:aida;
|
2024-07-05 11:26:46 +08:00 |
|
|
|
bc85e561d2
|
Merge branch 'dev/dev' into dev/dev_xp
|
2024-07-05 10:34:05 +08:00 |
|
shahaibo
|
be8968605b
|
BUGFIX:aida;
|
2024-07-04 16:52:06 +08:00 |
|
|
|
569c2e719f
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
# src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
|
2024-07-04 14:42:51 +08:00 |
|
shahaibo
|
5fa7e36dc2
|
BUGFIX:aida;
|
2024-07-04 13:02:47 +08:00 |
|
shahaibo
|
4a533b3cf0
|
BUGFIX:aida;
|
2024-07-04 11:34:51 +08:00 |
|
|
|
d2129459fe
|
S3Util 工具类修改
|
2024-07-03 16:43:22 +08:00 |
|
shahaibo
|
9784d07680
|
BUGFIX:aida;
|
2024-07-03 15:22:01 +08:00 |
|
shahaibo
|
a71fa4df51
|
BUGFIX:aida;
|
2024-07-02 15:23:27 +08:00 |
|
shahaibo
|
ce384dbba9
|
BUGFIX:aida;
|
2024-07-02 13:48:53 +08:00 |
|
shahaibo
|
dd8f5696a2
|
BUGFIX:aida;
|
2024-06-28 16:52:16 +08:00 |
|
shahaibo
|
4211bce256
|
BUGFIX:aida;
|
2024-06-28 15:45:39 +08:00 |
|
shahaibo
|
bc240cd2ee
|
TASK:aida;
|
2024-06-27 17:36:47 +08:00 |
|
shahaibo
|
f869f8eb10
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-27 15:33:38 +08:00 |
|
shahaibo
|
9b438c78a3
|
TASK:aida;
|
2024-06-27 15:33:26 +08:00 |
|
|
|
a5b435b80f
|
S3 Util 新增工具类
|
2024-06-26 18:00:47 +08:00 |
|
|
|
a64d4e30de
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-26 14:02:45 +08:00 |
|
|
|
0759452381
|
积分相关修改
1、BUGFIX: 用户表中的积分与积分详细中不统一;
2、To_Product_Image 添加扣除积分
3、每周刷新付费用户积分
|
2024-06-26 13:55:20 +08:00 |
|
shahaibo
|
58a78a5366
|
TASK:aida;
|
2024-06-26 13:24:27 +08:00 |
|
shahaibo
|
9bd695a24d
|
TASK:aida;
|
2024-06-26 10:47:56 +08:00 |
|
|
|
e614e3a07a
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/GenerateService.java
|
2024-06-25 16:59:41 +08:00 |
|
shahaibo
|
e093d694fd
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-25 16:43:44 +08:00 |
|
shahaibo
|
a5bfc4e41d
|
TASK:aida;
|
2024-06-25 16:43:29 +08:00 |
|
|
|
be001477ce
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-06-25 15:42:22 +08:00 |
|
|
|
3e150b2067
|
获取服装category bug修改
|
2024-06-25 15:29:19 +08:00 |
|
