Commit Graph

218 Commits

Author SHA1 Message Date
eson
fb071cf60b 测试登录验证 2023-08-25 16:19:47 +08:00
eson
7234b06745 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-25 15:37:58 +08:00
eson
f91f9d3230 修复 jwt payload解析的错误 2023-08-25 15:37:35 +08:00
laodaming
c4f888a52f fix 2023-08-25 12:01:01 +08:00
momo
318e210086 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-25 11:21:49 +08:00
momo
24384f6a61 fix:请求算法,添加错误提示 2023-08-25 11:21:43 +08:00
laodaming
e3aff09ede fix 2023-08-25 11:06:32 +08:00
eson
6919d61ef5 完善一部分websocket的代码 2023-08-24 18:28:01 +08:00
laodaming
dcdc949a90 fix 2023-08-24 15:45:23 +08:00
laodaming
dad56a677b fix 2023-08-24 14:24:04 +08:00
eson
bcd79f828c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-24 11:47:39 +08:00
eson
d8ddad6fe9 修复json的类型影响 2023-08-24 11:47:22 +08:00
momo
c92944f0dc fix:裁剪业务逻辑调整 2023-08-23 18:38:51 +08:00
momo
5443ad654c fix:裁剪业务逻辑调整 2023-08-23 17:51:51 +08:00
laodaming
25bf157977 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:54:09 +08:00
laodaming
70544827cd fix 2023-08-23 15:54:02 +08:00
momo
47401c49bd fix:裁剪业务逻辑调整 2023-08-23 15:44:59 +08:00
momo
b1a1979f79 fix:裁剪业务逻辑调整 2023-08-23 15:33:31 +08:00
momo
038f5d84ed fix:裁剪业务逻辑调整 2023-08-23 15:19:49 +08:00
momo
cf33f2f179 fix:裁剪业务逻辑调整 2023-08-23 15:14:34 +08:00
momo
dc0ea32662 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 15:10:31 +08:00
momo
3a2abde3b4 fix:裁剪业务逻辑调整 2023-08-23 15:10:22 +08:00
laodaming
b91c8d75f0 fix 2023-08-23 15:08:45 +08:00
momo
89d8a8963c fix:裁剪业务逻辑调整 2023-08-23 14:22:36 +08:00
momo
1e25f79d4a fix:裁剪业务逻辑调整 2023-08-23 11:41:02 +08:00
momo
2ef3547724 fix:裁剪业务逻辑调整 2023-08-23 11:09:14 +08:00
eson
bfea775c0b fix 2023-08-22 14:34:13 +08:00
eson
37c2144725 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-22 13:43:41 +08:00
eson
2dee02b6c5 修改mysql连接 2023-08-22 13:43:13 +08:00
momo
462ac4915b fix:base上传强制更新 2023-08-22 10:54:33 +08:00
momo
80a9517a1f fix:base上传强制更新 2023-08-22 10:48:10 +08:00
eson
d35ffd793a Merge branch 'develop' into feature/auth 2023-08-22 10:34:21 +08:00
laodaming
f8bb4dff17 fix 2023-08-21 16:19:30 +08:00
Hiven
1b5e9623a0 fix:合图调整 2023-08-18 19:37:11 +08:00
eson
d012ef5f83 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-17 14:10:20 +08:00
Hiven
cb3e8d4db6 fix:重构合图模块 2023-08-16 17:33:34 +08:00
laodaming
a022e5a8d9 fix 2023-08-16 12:16:23 +08:00
eson
6fe706e9e7 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-16 10:43:33 +08:00
eson
e565565627 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-16 10:22:12 +08:00
Hiven
69f08415fc fix:重构合图模块 2023-08-15 18:35:16 +08:00
laodaming
a58bd967e9 fix 2023-08-15 14:31:51 +08:00
laodaming
48cd4b2fea fix 2023-08-15 14:21:32 +08:00
laodaming
c5ef6cfa14 fix 2023-08-15 11:18:22 +08:00
laodaming
24a5bf11a3 fix 2023-08-14 17:31:57 +08:00
Hiven
fde5ef8b25 feat:新增商户列表/保存用户信息 2023-08-14 14:41:54 +08:00
Hiven
57e635c26c feat:新增商户列表/保存用户信息 2023-08-14 14:40:50 +08:00
eson
187cb48a41 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-14 14:12:33 +08:00
eson
117330ee16 基本完成重置密码和忘记密码 2023-08-14 14:09:38 +08:00
laodaming
5bc6f411be fix 2023-08-14 12:05:22 +08:00
eson
ae07370214 重置密码 2023-08-11 17:39:18 +08:00