Commit Graph

296 Commits

Author SHA1 Message Date
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
laodaming
ac1800bb26 fix 2023-08-15 19:43:50 +08:00
laodaming
35cb2ef1ce fix 2023-08-15 17:10:43 +08:00
laodaming
c4dc31493a fix 2023-08-15 16:50:35 +08:00
Hiven
76e0884c11 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 11:20:19 +08:00
Hiven
90229ca23e fix:重构合图模块 2023-08-15 11:20:09 +08:00
laodaming
c5ef6cfa14 fix 2023-08-15 11:18:22 +08:00
Hiven
d1c6f5cdc5 fix:重构合图模块 2023-08-15 10:58:24 +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
35b02302eb fix 2023-08-14 12:30:14 +08:00
laodaming
2bb1c73e4a fix 2023-08-14 11:35:23 +08:00
laodaming
cfc7b22090 fix 2023-08-14 11:04:25 +08:00
laodaming
48afd3105f fix 2023-08-11 18:59:03 +08:00
eson
ae07370214 重置密码 2023-08-11 17:39:18 +08:00
laodaming
dbe6e99f2d fix 2023-08-11 14:52:16 +08:00
eson
9664271474 修改Wid为string 2023-08-11 12:07:26 +08:00
Hiven
83b0b7f5ab fix:修复上传 2023-08-10 19:08:06 +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
13ad52d095 fix:修复上传 2023-08-10 15:23:28 +08:00
eson
05e8def85a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 14:21:22 +08:00
Hiven
d5e5cdc8f0 feat:获取资源详情 2023-08-09 14:18:27 +08:00
laodaming
2ed06a6df0 fix 2023-08-09 14:12:58 +08:00
Hiven
d810b87c09 feat:合图功能,封装上传base64等等 2023-08-09 11:46:24 +08:00
eson
056101121b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-09 10:29:53 +08:00
laodaming
2f1ef81263 fix 2023-08-08 17:03:54 +08:00
laodaming
584498f556 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 16:27:53 +08:00
laodaming
6d58e6bb22 fix 2023-08-08 16:27:42 +08:00
eson
d7345b577c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 15:21:56 +08:00
Hiven
399d3b9157 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-08 14:55:28 +08:00
Hiven
1887b6e7b6 =fix:修复 2023-08-08 14:55:17 +08:00
eson
8bea89754b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 14:18:45 +08:00
laodaming
9e5b08b9eb fix 2023-08-08 12:56:53 +08:00
Hiven
2cd24098df Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 19:41:50 +08:00
Hiven
f87842deb4 fix:修复 2023-08-07 19:41:44 +08:00
laodaming
2c27b85c33 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 17:20:03 +08:00
laodaming
74708d3b21 fix 2023-08-07 17:19:55 +08:00
Hiven
e2e2880514 fix:调整 2023-08-07 17:10:09 +08:00
laodaming
7510b363d6 fix 2023-08-07 12:31:31 +08:00
Hiven
869873deda Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-07 11:34:28 +08:00
Hiven
39fe427f8e fix:文件上传--base64 2023-08-07 11:34:22 +08:00
laodaming
36efad44df fix 2023-08-07 11:25:06 +08:00
laodaming
a106082364 fix 2023-08-07 10:48:14 +08:00
laodaming
d5a6f780a5 fix 2023-08-04 16:50:01 +08:00
Hiven
56acf68393 fix:接口调整 2023-08-03 18:27:52 +08:00
Hiven
6158779a95 调整 2023-08-03 17:37:25 +08:00