eson
|
d721708615
|
fix
|
2023-08-29 15:23:33 +08:00 |
|
eson
|
88e68c3903
|
fix
|
2023-08-29 15:21:19 +08:00 |
|
eson
|
0977c8aed2
|
fix
|
2023-08-29 15:17:51 +08:00 |
|
eson
|
d884624aad
|
fix
|
2023-08-29 15:15:39 +08:00 |
|
eson
|
57d95e0ebe
|
fix
|
2023-08-29 15:11:19 +08:00 |
|
eson
|
53f9bbe0d5
|
fix
|
2023-08-29 15:06:48 +08:00 |
|
eson
|
2789fad2f1
|
fix
|
2023-08-29 14:57:09 +08:00 |
|
eson
|
b9447dae4d
|
fix
|
2023-08-29 14:54:53 +08:00 |
|
eson
|
122c850d2e
|
fix
|
2023-08-29 14:49:59 +08:00 |
|
eson
|
6baf9cd19c
|
fix
|
2023-08-29 14:44:59 +08:00 |
|
eson
|
db2c41f0ce
|
fix
|
2023-08-29 14:40:08 +08:00 |
|
eson
|
31bb514b34
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-08-29 14:36:58 +08:00 |
|
eson
|
229fe8f2d8
|
fix
|
2023-08-29 14:36:53 +08:00 |
|
laodaming
|
d07b910e13
|
Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop
|
2023-08-29 14:35:11 +08:00 |
|
laodaming
|
f8a89a7bc6
|
fix
|
2023-08-29 14:35:04 +08:00 |
|
eson
|
3103d69bae
|
fix
|
2023-08-29 14:19:47 +08:00 |
|
laodaming
|
629030085c
|
fix
|
2023-08-29 10:31:25 +08:00 |
|
laodaming
|
458202ba6e
|
fix
|
2023-08-29 10:21:11 +08:00 |
|
laodaming
|
3dc230495a
|
fix
|
2023-08-28 18:37:58 +08:00 |
|
laodaming
|
a3f8e0e250
|
1
|
2023-08-28 14:57:01 +08:00 |
|
laodaming
|
f9de30a838
|
1
|
2023-08-28 14:56:01 +08:00 |
|
eson
|
bde9e98f62
|
fix
|
2023-08-28 14:21:06 +08:00 |
|
eson
|
f91f9d3230
|
修复 jwt payload解析的错误
|
2023-08-25 15:37:35 +08:00 |
|
eson
|
6919d61ef5
|
完善一部分websocket的代码
|
2023-08-24 18:28:01 +08:00 |
|
eson
|
648cf5cb20
|
删除metakey
|
2023-08-24 11:57:01 +08:00 |
|
eson
|
d8ddad6fe9
|
修复json的类型影响
|
2023-08-24 11:47:22 +08:00 |
|
eson
|
d31e84c425
|
修改数据库字段
|
2023-08-23 16:51:47 +08:00 |
|
laodaming
|
b91c8d75f0
|
fix
|
2023-08-23 15:08:45 +08:00 |
|
laodaming
|
b373b7ed73
|
fix
|
2023-08-22 17:19:53 +08:00 |
|
laodaming
|
bc04dbe43e
|
fix
|
2023-08-22 17:18:06 +08:00 |
|
laodaming
|
0001ea89f2
|
fix
|
2023-08-22 17:12:30 +08:00 |
|
eson
|
f5c9909d00
|
修改 正确的表
|
2023-08-22 14:20:30 +08:00 |
|
eson
|
37c2144725
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-08-22 13:43:41 +08:00 |
|
laodaming
|
0fd64a27bd
|
fix
|
2023-08-22 12:16:02 +08:00 |
|
eson
|
d35ffd793a
|
Merge branch 'develop' into feature/auth
|
2023-08-22 10:34:21 +08:00 |
|
laodaming
|
6a912a145e
|
fix
|
2023-08-21 10:21:02 +08:00 |
|
laodaming
|
1f36e62727
|
fix
|
2023-08-18 12:18:56 +08:00 |
|
laodaming
|
f519e27719
|
fix
|
2023-08-18 11:41:36 +08:00 |
|
laodaming
|
f892a216d6
|
fix
|
2023-08-17 18:19:15 +08:00 |
|
laodaming
|
784d8f2624
|
fix
|
2023-08-17 15:54:03 +08:00 |
|
laodaming
|
ddfed4a2ef
|
fix
|
2023-08-17 14:11: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 |
|
laodaming
|
3f9ccaeea8
|
fix
|
2023-08-17 14:03:52 +08:00 |
|
laodaming
|
82c7fc96f5
|
fix
|
2023-08-17 11:56:37 +08:00 |
|
laodaming
|
d2c8fa9020
|
fix
|
2023-08-17 11:49:31 +08:00 |
|
laodaming
|
f84644b406
|
fix
|
2023-08-17 11:28:56 +08:00 |
|
laodaming
|
be95ff9d05
|
fix
|
2023-08-17 11:14:47 +08:00 |
|
laodaming
|
757a7fb0b4
|
fix
|
2023-08-17 11:09:59 +08:00 |
|
laodaming
|
07dbf5eb6d
|
fix
|
2023-08-16 17:48:03 +08:00 |
|
Hiven
|
7afb089f0d
|
Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop
|
2023-08-16 17:33:39 +08:00 |
|
Hiven
|
cb3e8d4db6
|
fix:重构合图模块
|
2023-08-16 17:33:34 +08:00 |
|
laodaming
|
a422979748
|
fix
|
2023-08-16 17:18:51 +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 |
|
laodaming
|
c9dfec717c
|
fix
|
2023-08-15 15:47:39 +08:00 |
|
laodaming
|
c5ef6cfa14
|
fix
|
2023-08-15 11:18:22 +08:00 |
|
laodaming
|
24a5bf11a3
|
fix
|
2023-08-14 17:31:57 +08:00 |
|
laodaming
|
13c6eea1a8
|
fix
|
2023-08-14 15:08:24 +08:00 |
|
laodaming
|
81bfb0dda8
|
fix
|
2023-08-14 15:07:12 +08:00 |
|
laodaming
|
b7849935a0
|
fix
|
2023-08-14 15:06:32 +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 |
|
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 |
|
laodaming
|
dbe6e99f2d
|
fix
|
2023-08-11 14:52:16 +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 |
|
Hiven
|
db5b576799
|
fix:修复上传
|
2023-08-10 14:49:46 +08:00 |
|
Hiven
|
7f44f46336
|
fix:修复上传
|
2023-08-10 14:29:59 +08:00 |
|
laodaming
|
bd82008985
|
fix
|
2023-08-10 12:30:53 +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
|
fcf7c909a3
|
fix
|
2023-08-09 15:29:27 +08:00 |
|
eson
|
05e8def85a
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-08-09 14:21:22 +08:00 |
|
laodaming
|
e185ae7458
|
fix
|
2023-08-09 12:28:06 +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
|
5faeacd472
|
fix
|
2023-08-08 18:35:29 +08:00 |
|
laodaming
|
2f1ef81263
|
fix
|
2023-08-08 17:03:54 +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 |
|
laodaming
|
3c0d1a8d7a
|
fix
|
2023-08-08 14:31:40 +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
|
93191d3beb
|
fix
|
2023-08-08 12:22:15 +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 |
|
Hiven
|
6158779a95
|
调整
|
2023-08-03 17:37:25 +08:00 |
|
Hiven
|
39ffc78d6d
|
用户模块--logo列表
|
2023-08-03 14:38:17 +08:00 |
|
Hiven
|
464133be97
|
上传logo
|
2023-08-02 18:19:21 +08:00 |
|
Hiven
|
d06241b267
|
上传logo
|
2023-08-02 18:14:53 +08:00 |
|
laodaming
|
786fc59b0d
|
fixz
|
2023-08-02 15:10:16 +08:00 |
|
laodaming
|
1f8d9029eb
|
Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop
|
2023-08-02 15:06:12 +08:00 |
|
laodaming
|
4aaa5c169d
|
fix
|
2023-08-02 15:06:04 +08:00 |
|
Hiven
|
9363ca68b6
|
上传完善
|
2023-08-02 11:50:53 +08:00 |
|
Hiven
|
4a2a7822b7
|
多文件上传--后端
|
2023-08-01 18:15:55 +08:00 |
|
Hiven
|
f2109eee9b
|
订单退款
|
2023-07-31 11:32:40 +08:00 |
|
Hiven
|
1225a4efdc
|
退款
|
2023-07-28 19:03:36 +08:00 |
|
eson
|
648ef75a2e
|
fix
|
2023-07-28 13:10:43 +08:00 |
|
eson
|
719c41db00
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-07-28 13:10:32 +08:00 |
|
Hiven
|
ae717f932e
|
合并
|
2023-07-28 11:24:10 +08:00 |
|
Hiven
|
335ecc1f41
|
分支合并
|
2023-07-28 11:20:12 +08:00 |
|
Hiven
|
334ea4aa3f
|
支付成功回调
|
2023-07-28 11:15:42 +08:00 |
|
eson
|
3be161a011
|
tijiao
|
2023-07-27 19:47:52 +08:00 |
|
eson
|
64c6c19918
|
更新 新的表
|
2023-07-27 16:56:51 +08:00 |
|
eson
|
d635811b5f
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
|
2023-07-27 16:49:25 +08:00 |
|
eson
|
0ce35645b2
|
for save
|
2023-07-27 16:48:43 +08:00 |
|
Hiven
|
dbf500813c
|
支付成功通知
|
2023-07-26 19:23:16 +08:00 |
|
laodaming
|
88a59bbdea
|
fix
|
2023-07-26 16:00:19 +08:00 |
|
laodaming
|
736f57c0c2
|
fix
|
2023-07-26 14:17:30 +08:00 |
|
Hiven
|
e05fcd8248
|
合并代码
|
2023-07-26 11:09:18 +08:00 |
|
Hiven
|
95baad761a
|
支付模块
|
2023-07-26 11:06:05 +08:00 |
|
laodaming
|
c7536d0fdb
|
fix
|
2023-07-26 11:02:30 +08:00 |
|
Hiven
|
fd9e30ea74
|
订单列表--完善
|
2023-07-24 18:04:24 +08:00 |
|
laodaming
|
7e4708e8d8
|
fix
|
2023-07-21 14:07:42 +08:00 |
|
laodaming
|
50817d7ae2
|
fix
|
2023-07-21 12:27:37 +08:00 |
|
laodaming
|
edd4104ce7
|
fix
|
2023-07-21 10:33:43 +08:00 |
|
laodaming
|
532929a563
|
fix
|
2023-07-20 18:18:36 +08:00 |
|
laodaming
|
0e752e31fd
|
fix
|
2023-07-20 18:04:50 +08:00 |
|
Hiven
|
2f5ce8dd77
|
用户订单列表完善
|
2023-07-20 17:49:09 +08:00 |
|
laodaming
|
0e72027ff3
|
fix
|
2023-07-20 17:35:13 +08:00 |
|
laodaming
|
20e32ae078
|
fix
|
2023-07-20 15:43:55 +08:00 |
|
laodaming
|
9ff4468778
|
fix
|
2023-07-20 14:56:28 +08:00 |
|
Hiven
|
52d47f78ac
|
获取用户订单列表接口,以及工具方法
|
2023-07-20 14:43:59 +08:00 |
|
laodaming
|
4a2230d90c
|
fix
|
2023-07-20 12:27:07 +08:00 |
|
laodaming
|
b8333ecaf8
|
fix
|
2023-07-20 11:08:35 +08:00 |
|
eson
|
6264440017
|
添加gorm的model结构一个表名的入口
|
2023-07-20 10:13:18 +08:00 |
|
eson
|
20a7149eb6
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-07-19 16:45:07 +08:00 |
|
eson
|
a3151acb70
|
修改fs_user的sub字段
|
2023-07-19 16:44:45 +08:00 |
|
laodaming
|
f09220cf2d
|
fix
|
2023-07-19 14:01:53 +08:00 |
|
laodaming
|
e1bc5fbe51
|
fix
|
2023-07-17 17:08:45 +08:00 |
|
laodaming
|
73ce1e6db3
|
fix
|
2023-07-17 14:40:24 +08:00 |
|
laodaming
|
fffdf448c4
|
fix
|
2023-07-17 11:42:29 +08:00 |
|
laodaming
|
0db42491ae
|
fix
|
2023-07-14 16:48:04 +08:00 |
|
laodaming
|
3a6ab7a666
|
fix
|
2023-07-14 15:57:27 +08:00 |
|
laodaming
|
86a2deacfb
|
fix
|
2023-07-14 14:38:34 +08:00 |
|
laodaming
|
6cd5a6d0e8
|
fix
|
2023-07-13 19:05:13 +08:00 |
|
laodaming
|
e4925c2194
|
fix
|
2023-07-13 11:36:02 +08:00 |
|
laodaming
|
98c5727c7e
|
fix
|
2023-07-11 17:08:19 +08:00 |
|
laodaming
|
bb18b5effa
|
fix
|
2023-07-11 15:01:08 +08:00 |
|
laodaming
|
8e207ef600
|
fix
|
2023-07-11 14:16:13 +08:00 |
|
laodaming
|
8c2cfcb37b
|
fix
|
2023-07-11 11:53:15 +08:00 |
|
laodaming
|
22d0f6a5b1
|
fix
|
2023-07-11 11:28:57 +08:00 |
|
laodaming
|
f07e4a2084
|
fix
|
2023-07-10 19:42:55 +08:00 |
|
laodaming
|
852fca2afa
|
fix
|
2023-07-10 18:28:37 +08:00 |
|
eson
|
8f95be2ba5
|
测试登录成功
|
2023-07-10 17:38:44 +08:00 |
|
laodaming
|
791121c574
|
fix
|
2023-07-06 17:55:59 +08:00 |
|
laodaming
|
2b1728aac5
|
fix
|
2023-07-06 17:43:07 +08:00 |
|
laodaming
|
6337371cd1
|
fix
|
2023-07-05 16:03:16 +08:00 |
|
laodaming
|
31d22cda63
|
fix
|
2023-07-04 16:48:56 +08:00 |
|
laodaming
|
22b27141a4
|
fix
|
2023-07-03 17:33:59 +08:00 |
|
eson
|
5934017dbf
|
修改 model 序列化提示, 防止空值传入
|
2023-07-03 14:47:10 +08:00 |
|
eson
|
07121d0294
|
序列化修复
|
2023-07-03 14:36:11 +08:00 |
|
laodaming
|
c17ab5ae5c
|
fix
|
2023-06-30 17:20:11 +08:00 |
|
eson
|
7d386237fb
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-29 18:05:38 +08:00 |
|
eson
|
9b56d7ba51
|
TODO: render/ 相关模块
|
2023-06-29 18:04:59 +08:00 |
|
laodaming
|
f09e1b8f93
|
fix
|
2023-06-29 13:59:55 +08:00 |
|
eson
|
8ba8a67dfb
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-28 19:33:00 +08:00 |
|
eson
|
d4e75b1efc
|
TODO: 反射
|
2023-06-28 19:32:41 +08:00 |
|
laodaming
|
6abca6b271
|
fix
|
2023-06-28 17:05:31 +08:00 |
|
laodaming
|
b012db8e4e
|
fix
|
2023-06-28 14:55:13 +08:00 |
|
laodaming
|
5b9a814fbb
|
fix
|
2023-06-28 12:25:40 +08:00 |
|
laodaming
|
19f41f6dbc
|
fix
|
2023-06-27 18:35:26 +08:00 |
|
eson
|
0851c922ef
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-27 18:10:18 +08:00 |
|
eson
|
13c5a45a5e
|
报价单接近完成
|
2023-06-27 18:09:56 +08:00 |
|
laodaming
|
66ed487249
|
fix
|
2023-06-27 17:04:58 +08:00 |
|
laodaming
|
c5bcf9d676
|
fix
|
2023-06-27 14:25:25 +08:00 |
|
eson
|
a101764dcb
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-26 18:20:04 +08:00 |
|
eson
|
d74d27ab2d
|
backend
|
2023-06-26 18:19:51 +08:00 |
|
laodaming
|
7f71afd8b0
|
fix
|
2023-06-26 16:53:36 +08:00 |
|
eson
|
150ae1df77
|
TODO: backend
|
2023-06-25 20:00:27 +08:00 |
|
eson
|
1a0156c686
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-25 18:30:58 +08:00 |
|
eson
|
96c43325c0
|
添加后台用户表直接分离
|
2023-06-25 18:30:39 +08:00 |
|
laodaming
|
d876884397
|
fix
|
2023-06-25 17:11:42 +08:00 |
|
laodaming
|
81b315b12b
|
fix
|
2023-06-25 12:16:01 +08:00 |
|
laodaming
|
1a48387e92
|
fix
|
2023-06-25 11:28:37 +08:00 |
|
eson
|
efe02a0355
|
修复 AuthKey为空的时候 也可以过.
|
2023-06-25 11:26:47 +08:00 |
|
eson
|
8bd6f019ba
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-21 18:59:44 +08:00 |
|
eson
|
d987601afd
|
faq
|
2023-06-21 18:59:27 +08:00 |
|
laodaming
|
cac0161585
|
fix
|
2023-06-21 18:06:39 +08:00 |
|
eson
|
b27aaab6b6
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-21 16:40:20 +08:00 |
|
eson
|
29d5c91736
|
修改api的request
|
2023-06-21 16:39:55 +08:00 |
|
laodaming
|
dfcceaea8e
|
fix
|
2023-06-21 16:35:43 +08:00 |
|
laodaming
|
89dfd58e1c
|
fix
|
2023-06-21 15:06:09 +08:00 |
|
laodaming
|
41386fca3b
|
fix
|
2023-06-21 12:34:57 +08:00 |
|
eson
|
4fb57e1c39
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-21 12:22:18 +08:00 |
|
eson
|
7fe53f749e
|
完成AllModels序列化
|
2023-06-21 12:21:56 +08:00 |
|
laodaming
|
db9c2f3cc7
|
fix
|
2023-06-21 12:11:43 +08:00 |
|
eson
|
389f12b8c5
|
添加AllModels
|
2023-06-21 11:29:09 +08:00 |
|
laodaming
|
edeb2bb5f1
|
fix
|
2023-06-20 19:56:18 +08:00 |
|
eson
|
b2062d6448
|
修复SetStatus错误
|
2023-06-20 19:52:38 +08:00 |
|
eson
|
e6971575f1
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-20 19:37:08 +08:00 |
|
eson
|
e50dac6b1c
|
Order订单待测试
|
2023-06-20 19:36:28 +08:00 |
|
laodaming
|
313e8a9457
|
fix
|
2023-06-20 18:05:29 +08:00 |
|
eson
|
d4d11db732
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-20 17:29:18 +08:00 |
|
eson
|
6c6066cea1
|
更新合并
|
2023-06-20 17:29:02 +08:00 |
|
laodaming
|
7ef6f453dc
|
fix
|
2023-06-20 17:28:28 +08:00 |
|
eson
|
c870ab773a
|
Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
|
2023-06-20 16:47:14 +08:00 |
|
eson
|
2d3c394c73
|
Order 枚举
|
2023-06-20 16:46:56 +08:00 |
|
laodaming
|
0f4ae5164b
|
fix
|
2023-06-20 14:59:13 +08:00 |
|