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 |
|
|
|
0759452381
|
积分相关修改
1、BUGFIX: 用户表中的积分与积分详细中不统一;
2、To_Product_Image 添加扣除积分
3、每周刷新付费用户积分
|
2024-06-26 13:55:20 +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
|
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 |
|
|
|
8ea06c05e9
|
1、generate 积分扣除并添加相关积分详细
2、获取服装category bug修改
|
2024-06-25 12:18:18 +08:00 |
|
shahaibo
|
9b589eece6
|
TASK:aida;
|
2024-06-25 10:59:58 +08:00 |
|
|
|
aacbe92cdc
|
generate cancel
|
2024-06-24 17:02:25 +08:00 |
|
|
|
57ab6c64ef
|
flask 迁移到fast-api 9992 -> 9994
|
2024-06-24 14:33:34 +08:00 |
|
|
|
30d5466805
|
添加查询Code-Create数据库，监控新增付费记录并对付费用户进行账号新增或延长账号有效期的操作
|
2024-06-21 15:11:31 +08:00 |
|
|
|
8457a61ded
|
generate 添加积分扣除
|
2024-06-20 15:26:22 +08:00 |
|
|
|
e7f9b77fe5
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
|
2024-06-20 10:39:36 +08:00 |
|
shahaibo
|
6c0f65b801
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-20 10:31:13 +08:00 |
|
shahaibo
|
ad1fa0e4c2
|
TASK:aida;
|
2024-06-20 10:27:28 +08:00 |
|
|
|
227c742f0d
|
新增接口：调查问卷
|
2024-06-20 10:27:04 +08:00 |
|
|
|
c317942447
|
BUGFIX: getDetail印花不显示
|
2024-06-19 11:41:39 +08:00 |
|
|
|
4f12aa92b6
|
slogan 参数校验
|
2024-06-18 13:13:20 +08:00 |
|
shahaibo
|
1f0439c7f9
|
BUGFIX:aida;
|
2024-06-17 19:33:54 +08:00 |
|
shahaibo
|
b2bc47da99
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/resources/application-dev.properties
|
2024-06-17 17:38:04 +08:00 |
|
shahaibo
|
02787db0a1
|
TASK:aida;
|
2024-06-17 17:37:15 +08:00 |
|
|
|
257c99698e
|
fastapi -> flask
|
2024-06-17 13:21:58 +08:00 |
|
|
|
8ff8a7480f
|
slogan 恢复
|
2024-06-17 11:21:54 +08:00 |
|
|
|
1d60a6a129
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
|
2024-06-17 10:25:20 +08:00 |
|
|
|
0017568cc7
|
slogan
|
2024-06-17 10:21:49 +08:00 |
|
shahaibo
|
18914bea7e
|
TASK:aida;
|
2024-06-17 09:34:48 +08:00 |
|
|
|
619d33b412
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/resources/application-dev.properties
# src/main/resources/messages_en.properties
# src/main/resources/messages_zh.properties
|
2024-06-12 10:50:05 +08:00 |
|
|
|
1a48527c70
|
1、design single 添加 design elements
2、design single -- print添加level2Type
3、替换部分flask接口 为 fastAPI接口
|
2024-06-12 10:41:59 +08:00 |
|
shahaibo
|
ee68a5d782
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-12 09:48:11 +08:00 |
|
shahaibo
|
3a29d25060
|
TASK:aida;
|
2024-06-12 09:47:55 +08:00 |
|
|
|
77f514a03b
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/python/PythonService.java
# src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
|
2024-06-11 15:23:24 +08:00 |
|
|
|
954f6207ec
|
design Single 允许画笔修改sketch后进行design
|
2024-06-05 11:43:35 +08:00 |
|
|
|
891f6fb15f
|
Printboard level2Type 语言适配
|
2024-06-04 15:19:30 +08:00 |
|
|
|
49b086ad10
|
generate 添加Logo与Slogan
|
2024-06-03 17:13:48 +08:00 |
|
|
|
86e7119cfb
|
AlipayHK 回调及相关数据处理
|
2024-05-31 16:28:23 +08:00 |
|
|
|
1aea8e93f2
|
AlipayHK 新增指定订单查询接口
|
2024-05-30 09:54:49 +08:00 |
|
shahaibo
|
ffd371e5b4
|
BUGFIX:渐变色回退;
|
2024-05-28 11:48:35 +08:00 |
|
shahaibo
|
40aad9d1a3
|
BUGFIX:渐变色回退;
|
2024-05-28 11:32:49 +08:00 |
|
|
|
f4e9a3474a
|
Merge branch 'test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-05-28 10:59:34 +08:00 |
|
shahaibo
|
890389843f
|
BUGFIX:试用时间link14天;
|
2024-05-28 10:43:50 +08:00 |
|
|
|
76618de386
|
不等比缩放
|
2024-05-27 18:07:33 +08:00 |
|
|
|
eda92b3f0b
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
|
2024-05-27 15:13:20 +08:00 |
|
shahaibo
|
4ba5f63a62
|
TASK:workspace;
|
2024-05-27 15:05:46 +08:00 |
|
shahaibo
|
8b274b2822
|
Merge remote-tracking branch 'origin/release/3.0' into dev/dev
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
|
2024-05-27 15:03:02 +08:00 |
|
|
|
54cbaf4b80
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
# src/main/resources/application-dev.properties
|
2024-05-27 13:24:51 +08:00 |
|
|
|
c688af01f2
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
|
2024-05-27 13:20:31 +08:00 |
|
shahaibo
|
37de7d9276
|
BUGFIX:design;
|
2024-05-24 15:18:01 +08:00 |
|
shahaibo
|
02b3a407a9
|
BUGFIX:色块重复
|
2024-05-23 16:38:40 +08:00 |
|
|
|
5ebf0669f5
|
alipay-hk 切换到live环境
|
2024-05-23 15:48:55 +08:00 |
|
shahaibo
|
205f0d54c5
|
BUGFIX:workspace;
|
2024-05-22 14:09:16 +08:00 |
|
