Commit Graph

128 Commits

Author SHA1 Message Date
eson
c6eb43b513 fix 2023-08-22 16:27:05 +08:00
eson
2dee02b6c5 修改mysql连接 2023-08-22 13:43:13 +08:00
eson
3f9c050ca5 test 2023-08-18 19:34: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
laodaming
54568173af fix 2023-08-15 13:35:23 +08:00
laodaming
edf89ea301 fix 2023-08-15 12:34:41 +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
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
5f1a07f737 fix:修复上传 2023-08-10 14:58:33 +08:00
eson
440f13bee8 感动中国 2023-08-10 12:04:36 +08:00
eson
1913beb3f7 修改状态机的写法 2023-08-09 16:54:52 +08:00
eson
0adaa00a4c 合并 2023-08-08 14:20:57 +08:00
eson
8bea89754b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth 2023-08-08 14:18:45 +08:00
Hiven
87803a6e44 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-03 17:37:32 +08:00
Hiven
6158779a95 调整 2023-08-03 17:37:25 +08:00
laodaming
9f01ecaf80 fix 2023-08-03 16:49:25 +08:00
laodaming
b40293fdd9 fix 2023-08-03 15:54:50 +08:00
Hiven
a864335c0e 用户模块--logo列表调整返回 2023-08-03 14:55:56 +08:00
Hiven
ddb93bae41 用户模块--logo列表完善 2023-08-03 14:50:07 +08:00
Hiven
39ffc78d6d 用户模块--logo列表 2023-08-03 14:38:17 +08:00
Hiven
f2109eee9b 订单退款 2023-07-31 11:32:40 +08:00
fe51e85983 修改为龙舟 2023-07-31 00:41:04 +08:00
7fd48edef8 do 2023-07-30 23:17:02 +08:00
049aedf115 完成配置replica_id 2023-07-30 19:25:59 +08:00
Hiven
1225a4efdc 退款 2023-07-28 19:03:36 +08:00
eson
42a965ab39 解决冲突 2023-07-27 16:54:57 +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
01cc7da3b4 大改jwt 2023-07-26 12:15:15 +08:00
Hiven
95baad761a 支付模块 2023-07-26 11:06:05 +08:00
eson
4c104b56ae 忽略掉后台 2023-07-26 10:52:33 +08:00
852c5e4a94 finish auto_config 2023-07-26 00:19:21 +08:00
eson
7200531c27 添加节点分布式 2023-07-25 19:32:51 +08:00
eson
b43b5dbd59 fix 2023-07-24 19:17:02 +08:00
Hiven
05e5842992 Merge branch 'develop' into orders 2023-07-24 19:15:33 +08:00
Hiven
fd9e30ea74 订单列表--完善 2023-07-24 18:04:24 +08:00
eson
a10e100364 save 2023-07-24 17:22:06 +08:00
eson
7ec78d1c35 重新调整w,r的入口 2023-07-24 13:17:02 +08:00
Hiven
95e6491de5 Merge branch 'develop' into orders 2023-07-24 13:07:04 +08:00
Hiven
f5cfed20d3 调整 2023-07-24 13:03:43 +08:00
eson
4c2f823178 可以登录 2023-07-24 12:32:05 +08:00
Hiven
5b4c43978e Merge branch 'develop' into orders 2023-07-24 12:20:38 +08:00
Hiven
f792215c2f 订单 2023-07-24 12:19:34 +08:00
eson
900d5bf24b 修改表单 2023-07-24 12:18:27 +08:00
eson
72a6412eed fix 2023-07-24 10:27:06 +08:00
Hiven
f4def7f8a0 修复 2023-07-24 10:26:24 +08:00
Hiven
3201f4d26d 修复 2023-07-24 10:10:26 +08:00
Hiven
a65efe5777 订单列表 2023-07-21 18:17:01 +08:00