Commit Graph

199 Commits

Author SHA1 Message Date
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
eson
9664271474 修改Wid为string 2023-08-11 12:07:26 +08:00
eson
432db5aec5 Merge branch 'develop' into feature/auth 2023-08-10 17:31:03 +08:00
eson
8c07a5f5d7 保存为了 websocket 2023-08-10 16:25:41 +08:00
Hiven
74cadf6e5b fix:修复上传 2023-08-10 16:13:06 +08:00
Hiven
5f1a07f737 fix:修复上传 2023-08-10 14:58:33 +08:00
Hiven
db5b576799 fix:修复上传 2023-08-10 14:49:46 +08:00
Hiven
7f44f46336 fix:修复上传 2023-08-10 14:29:59 +08:00
Hiven
a5a15664c9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-10 14:01:28 +08:00
Hiven
5f9888ca84 fix:修复上传 2023-08-10 14:01:22 +08:00
laodaming
bd82008985 fix 2023-08-10 12:30:53 +08:00
eson
440f13bee8 感动中国 2023-08-10 12:04:36 +08:00
eson
68488da99c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-10 10:44:24 +08:00
laodaming
5470f22e77 fix 2023-08-09 19:34:11 +08:00
laodaming
ea0804ad63 fix 2023-08-09 18:09:16 +08:00
laodaming
731cf006a6 fix 2023-08-09 17:08:50 +08:00
laodaming
28b9d1ac1f fix 2023-08-09 16:58:08 +08:00
eson
1913beb3f7 修改状态机的写法 2023-08-09 16:54:52 +08:00
laodaming
c51c9f228c fix 2023-08-09 16:08:58 +08:00
laodaming
84dc60be49 fix 2023-08-09 15:46:57 +08:00