|
|
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 |
|
shahaibo
|
775ae3266c
|
BUGFIX:定时任务开启;
|
2024-05-31 09:59:08 +08:00 |
|
|
|
1aea8e93f2
|
AlipayHK 新增指定订单查询接口
|
2024-05-30 09:54:49 +08:00 |
|
|
|
804dc9b1b4
|
添加aws S3访问工具类
|
2024-05-29 16:30:27 +08:00 |
|
shahaibo
|
3dc7866fba
|
BUGFIX:渐变色回退;
|
2024-05-28 11:52:33 +08:00 |
|
shahaibo
|
ffd371e5b4
|
BUGFIX:渐变色回退;
|
2024-05-28 11:48:35 +08:00 |
|
shahaibo
|
40aad9d1a3
|
BUGFIX:渐变色回退;
|
2024-05-28 11:32:49 +08:00 |
|
|
|
fb8de15eca
|
不等比缩放
|
2024-05-28 11:17:46 +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
|
031d71bf99
|
BUGFIX:design;
|
2024-05-22 15:12:37 +08:00 |
|
shahaibo
|
205f0d54c5
|
BUGFIX:workspace;
|
2024-05-22 14:09:16 +08:00 |
|
shahaibo
|
1303b1805a
|
TASK:style;
|
2024-05-22 11:40:01 +08:00 |
|
shahaibo
|
2845c2c8b9
|
BUGFIX:male_top;
|
2024-05-22 10:26:29 +08:00 |
|
shahaibo
|
cd817dbf57
|
TASK:style;
|
2024-05-22 09:50:34 +08:00 |
|
shahaibo
|
6e64eb741a
|
TASK:邮箱;
|
2024-05-20 22:32:45 +08:00 |
|
shahaibo
|
8f5a86db0b
|
TASK:监听;
|
2024-05-18 08:19:55 +08:00 |
|
shahaibo
|
14c99f6c6b
|
TASK:监听;
|
2024-05-18 01:31:26 +08:00 |
|
shahaibo
|
b8048704ba
|
TASK:监听;
|
2024-05-18 01:00:42 +08:00 |
|
shahaibo
|
b6704c3caf
|
TASK:取消监听;
|
2024-05-18 00:34:18 +08:00 |
|
shahaibo
|
980e1547cd
|
TASK:检查令牌日志注释;
|
2024-05-17 21:07:20 +08:00 |
|
shahaibo
|
ae2191f369
|
TASK:检查令牌日志注释;
|
2024-05-17 21:03:56 +08:00 |
|
shahaibo
|
4b1a58c036
|
TASK:检查令牌日志注释;
|
2024-05-17 20:58:54 +08:00 |
|
shahaibo
|
4dbd5a1fad
|
TASK:检查令牌日志注释;
|
2024-05-17 20:27:58 +08:00 |
|
shahaibo
|
f1eb48ae74
|
TASK:配置文件;
|
2024-05-17 19:25:50 +08:00 |
|
shahaibo
|
e634481113
|
TASK:配置文件;
|
2024-05-17 17:59:04 +08:00 |
|
shahaibo
|
b3591f879d
|
TASK:试用时间;
|
2024-05-17 15:23:26 +08:00 |
|
shahaibo
|
12c447d6b0
|
TASK:配置文件;
|
2024-05-17 12:14:20 +08:00 |
|
shahaibo
|
c73876e8b0
|
TASK:配置文件;
|
2024-05-17 12:13:35 +08:00 |
|
shahaibo
|
9f4dbda152
|
TASK:无新增用户邮件;
|
2024-05-17 10:39:00 +08:00 |
|
shahaibo
|
8e1766eed0
|
Merge remote-tracking branch 'origin/temp0516' into test/stable
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/config/MyTaskScheduler.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-05-17 10:31:29 +08:00 |
|
shahaibo
|
f1d67f2f7d
|
Merge branch 'release/3.0' into test/stable
|
2024-05-17 10:22:42 +08:00 |
|
shahaibo
|
ebb6577e98
|
TASK:portfolio;
|
2024-05-17 10:19:34 +08:00 |
|
|
|
5318e5d32a
|
generate text存db内容简化
|
2024-05-16 15:32:39 +08:00 |
|
|
|
2aabb2347b
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# pom.xml
|
2024-05-15 15:39:28 +08:00 |
|
|
|
3790b8ee72
|
Alipay-HK 创建订单和异步回调
|
2024-05-15 15:38:11 +08:00 |
|
|
|
f4766d4ab4
|
designSingle 入参记录
|
2024-05-13 17:22:21 +08:00 |
|