Commit Graph

2031 Commits

Author SHA1 Message Date
laodaming
4b7f920b5a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 14:35:41 +08:00
laodaming
90e0169eb7 fix 2023-10-18 14:35:33 +08:00
momo
a5b0cc0a65 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 14:01:53 +08:00
momo
e94917a9d2 feat:合图新增debug模块 2023-10-18 14:01:46 +08:00
laodaming
56f17f1bd8 fix 2023-10-18 12:21:11 +08:00
laodaming
5a173a491c fix 2023-10-18 12:02:04 +08:00
laodaming
bbf7c06bd4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-18 11:57:32 +08:00
laodaming
616fc938cb fix 2023-10-18 11:57:26 +08:00
momo
86547b9267 feat:合图新增debug模块 2023-10-18 11:54:58 +08:00
laodaming
95df7ccd04 fix 2023-10-18 11:44:47 +08:00
laodaming
732479d97b fix 2023-10-18 11:14:06 +08:00
eson
958624afde Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-18 11:07:52 +08:00
eson
8d7ee20a28 debug toekn 2023-10-18 11:07:48 +08:00
laodaming
571e9e6fac fix 2023-10-18 11:03:07 +08:00
eson
b53313811b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/debug-token 2023-10-18 10:23:12 +08:00
momo
bcf9dd8ab9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-17 18:32:51 +08:00
momo
6ae2cce870 feat:新增订单发票,下单地址调整 2023-10-17 18:32:43 +08:00
laodaming
aa1ab9937a fix 2023-10-17 18:16:11 +08:00
laodaming
b90f56502d fix 2023-10-17 17:49:49 +08:00
eson
e00dc9f3cf debug toekn 2023-10-17 17:25:48 +08:00
laodaming
68cf3a10d6 fix 2023-10-17 17:25:34 +08:00
laodaming
bfe0ee0652 fix 2023-10-17 17:08:30 +08:00
laodaming
c79a1aab49 fix 2023-10-17 16:19:44 +08:00
laodaming
0c5a5a466f fix 2023-10-17 15:56:48 +08:00
laodaming
e9255389e2 fix 2023-10-17 15:40:55 +08:00
laodaming
68a31236b3 整合目前新的详情接口 2023-10-17 15:40:44 +08:00
laodaming
ea1335607a 整合目前新的详情接口 2023-10-17 15:33:46 +08:00
laodaming
d97fbfdebf fix 2023-10-16 17:09:15 +08:00
laodaming
7495d458e6 fix 2023-10-16 17:06:17 +08:00
laodaming
a0d619692f fix 2023-10-16 17:01:58 +08:00
laodaming
06303361e0 fix 2023-10-16 16:54:07 +08:00
laodaming
2aeff09639 fix 2023-10-16 15:56:02 +08:00
laodaming
58978104bf fix 2023-10-16 15:31:35 +08:00
laodaming
95b7f1f859 fix 2023-10-16 15:29:06 +08:00
laodaming
f1afffd198 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-16 15:26:52 +08:00
laodaming
a1e6be40db fix 2023-10-16 15:26:45 +08:00
eson
8af873ac42 fix 2023-10-16 15:19:25 +08:00
laodaming
7f88233f28 fix 2023-10-16 15:18:43 +08:00
laodaming
669be27e0a fix 2023-10-16 15:05:03 +08:00
laodaming
ce413c494c fix 2023-10-16 11:16:39 +08:00
laodaming
23b2eded5a fix 2023-10-13 18:17:31 +08:00
laodaming
dbffda69fd fix 2023-10-13 17:44:02 +08:00
laodaming
2a1ceded61 fix 2023-10-12 17:02:16 +08:00
laodaming
d1313fca0c fix 2023-10-12 16:01:38 +08:00
laodaming
22ee293bfb fix 2023-10-12 14:44:09 +08:00
laodaming
1625975814 fix 2023-10-12 11:49:52 +08:00
laodaming
96c866f1d4 fix 2023-10-12 11:27:16 +08:00
laodaming
8a349399e1 fix 2023-10-12 11:19:01 +08:00
laodaming
cefe601046 fix 2023-10-12 11:05:05 +08:00
laodaming
edc50a15ec fix 2023-10-11 19:13:54 +08:00
laodaming
f65ff33e19 fix 2023-10-11 19:12:45 +08:00
laodaming
9dad383b03 fix 2023-10-11 19:10:03 +08:00
laodaming
7cc1addfe4 fix 2023-10-11 19:01:48 +08:00
laodaming
d93b009816 fix 2023-10-11 18:54:54 +08:00
laodaming
2e4be2800f fix 2023-10-11 18:54:14 +08:00
laodaming
afe8b26eee fix 2023-10-11 18:37:47 +08:00
laodaming
394f0c6e46 fix 2023-10-11 18:32:35 +08:00
laodaming
91c984db43 fix 2023-10-11 18:29:58 +08:00
laodaming
3d000cdc14 fix 2023-10-11 18:10:24 +08:00
laodaming
e77638b0e1 fix 2023-10-11 18:06:40 +08:00
laodaming
90277394fa fix 2023-10-11 17:58:38 +08:00
laodaming
c24ddb4af2 fix 2023-10-11 17:54:46 +08:00
laodaming
a138cdbd01 fix 2023-10-11 17:50:08 +08:00
laodaming
df1b599e51 fix 2023-10-11 16:28:39 +08:00
laodaming
aa31451210 fix 2023-10-11 16:21:20 +08:00
laodaming
8e11157c92 Merge branch 'develop' into feature/websocket 2023-10-11 15:22:48 +08:00
momo
9b09a33f47 fix:算法请求调整 2023-10-11 15:13:13 +08:00
laodaming
9627cc12bf fix 2023-10-11 14:42:49 +08:00
laodaming
2b084bfdc9 fix 2023-10-11 14:19:22 +08:00
eson
2d897d26d0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-11 12:23:46 +08:00
eson
9bb5f1b2dd contact us 2023-10-11 12:23:41 +08:00
laodaming
a6f0d49c6e fix 2023-10-11 12:20:38 +08:00
laodaming
2f45b83ba3 fix 2023-10-11 12:16:54 +08:00
laodaming
5584bfc4da Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 12:10:14 +08:00
laodaming
b86d6748b4 fix 2023-10-11 12:10:08 +08:00
eson
fff760253a Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-11 11:55:49 +08:00
eson
c6fa875148 email limit & password limit 2023-10-11 11:55:44 +08:00
laodaming
543099c8d7 fix 2023-10-11 11:52:54 +08:00
laodaming
350f06116e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-11 11:49:11 +08:00
laodaming
77cb259124 fix 2023-10-11 11:49:04 +08:00
eson
5b0b45b141 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-11 11:26:22 +08:00
laodaming
8f8419b8c1 fix 2023-10-11 11:26:11 +08:00
eson
10e794110f info address list 2023-10-11 11:25:38 +08:00
laodaming
501c4643f4 fix 2023-10-11 11:22:34 +08:00
laodaming
7883056ded fix 2023-10-11 11:22:11 +08:00
laodaming
c8e6467e9a fix 2023-10-11 11:18:50 +08:00
laodaming
3a9de995b2 fix 2023-10-11 10:49:00 +08:00
laodaming
97ae9e4d8e fix 2023-10-10 18:11:47 +08:00
laodaming
8cf76c7051 fix 2023-10-10 18:08:58 +08:00
laodaming
a0106e30cc fix 2023-10-10 17:50:56 +08:00
laodaming
9e71d9a60f fix 2023-10-10 17:49:47 +08:00
momo
fec42ad634 fix:算法请求调整 2023-10-10 17:17:28 +08:00
laodaming
ce31946e53 fix 2023-10-10 15:09:20 +08:00
laodaming
056fed40f1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-10 15:08:48 +08:00
laodaming
8f92776103 fix 2023-10-10 15:08:41 +08:00
laodaming
8593eb2dd3 fix 2023-10-10 14:59:00 +08:00
momo
3105c29071 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-10 14:58:55 +08:00
momo
6e8d47ae91 fix:算法请求调整 2023-10-10 14:58:36 +08:00
laodaming
3f0d8d017e fix 2023-10-10 14:15:43 +08:00
eson
ae27baa79b Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-10 11:21:50 +08:00
laodaming
1cfbbe7283 fix 2023-10-09 18:28:43 +08:00
laodaming
cbb57c8c34 fix 2023-10-09 18:21:45 +08:00
laodaming
83ef491069 fix 2023-10-09 17:57:54 +08:00
laodaming
0ce7cf8f17 fix 2023-10-09 17:56:28 +08:00
laodaming
142bdbdcb9 fix 2023-10-09 17:02:30 +08:00
laodaming
b4e98d5238 fix 2023-10-09 16:14:03 +08:00
eson
ff0960e2bb Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-09 16:03:18 +08:00
eson
bdb093e7da 添加 .gitignore 忽略二进制执行文件 2023-10-09 16:02:46 +08:00
laodaming
41949bef72 fix 2023-10-09 15:15:44 +08:00
laodaming
d73d748436 fix 2023-10-09 15:05:50 +08:00
eson
16acfb7320 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-09 14:42:01 +08:00
eson
9fdc5b4dbf proxyserver 2023-10-09 14:41:57 +08:00
laodaming
f42c8bd18c fix 2023-10-09 14:08:43 +08:00
laodaming
ba3e7ce31b fix 2023-10-09 12:28:08 +08:00
laodaming
12a6e95a11 fix 2023-10-09 11:20:38 +08:00
laodaming
e91bc83912 fix 2023-10-09 10:08:05 +08:00
laodaming
49877b4ef7 fix 2023-10-09 10:04:41 +08:00
laodaming
23b8e3cf3c fix 2023-10-09 10:03:15 +08:00
laodaming
7c065901c4 fix 2023-10-09 10:01:44 +08:00
momo
17dc892c07 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 18:38:45 +08:00
momo
634f1b9584 fix:新增订单关闭 2023-10-08 18:38:39 +08:00
laodaming
9faae14892 fix 2023-10-08 18:11:11 +08:00
laodaming
6bd9a0ab05 fix 2023-10-08 18:07:34 +08:00
laodaming
8d4901cdcd fix 2023-10-08 18:00:21 +08:00
laodaming
af35164fb2 fix 2023-10-08 17:15:27 +08:00
laodaming
939ee8e0fe fix 2023-10-08 17:07:59 +08:00
laodaming
f5de417b99 fix 2023-10-08 17:06:10 +08:00
laodaming
4dce0d7087 fix 2023-10-08 17:04:37 +08:00
laodaming
96b69fc8b9 fix 2023-10-08 16:27:25 +08:00
laodaming
066c911439 fix 2023-10-08 16:08:47 +08:00
laodaming
885aa081c6 fix 2023-10-08 16:07:55 +08:00
laodaming
d191bb3ca4 fix 2023-10-08 16:00:45 +08:00
laodaming
fdcd485f9f fix 2023-10-08 15:53:53 +08:00
momo
88f407edb9 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 15:48:34 +08:00
momo
6dc591283e fix:合图调整 2023-10-08 15:48:22 +08:00
laodaming
ddfe91a42e 新增获取收藏列表接口 2023-10-08 15:29:03 +08:00
momo
8c69e4d2d3 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 14:32:36 +08:00
momo
296194e730 fix:上传logo,报错信息反馈给前端 2023-10-08 14:32:31 +08:00
laodaming
a59273fe5b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 12:31:12 +08:00
laodaming
385540937e 11 2023-10-08 12:31:06 +08:00
eson
d146fbb631 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-08 12:19:03 +08:00
eson
bdf0dd7605 info address default 2023-10-08 12:18:58 +08:00
laodaming
cfea0cb09b Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-08 12:11:28 +08:00
laodaming
23094b2427 11 2023-10-08 12:11:19 +08:00
eson
7a2820e496 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-08 12:09:51 +08:00
eson
0f7d35ea00 info address default 2023-10-08 12:09:46 +08:00
laodaming
243fd29a60 增加收藏页的添加和删除接口 2023-10-08 12:06:48 +08:00
laodaming
b93691a0bf 增加收藏页的添加和删除接口 2023-10-08 12:04:00 +08:00
laodaming
0fde3c8d91 fix 2023-10-08 10:33:25 +08:00
laodaming
f933fcac69 fix 2023-10-08 10:31:42 +08:00
laodaming
414a3f8507 fix 2023-10-08 10:22:00 +08:00
momo
3f78cfd824 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 18:37:04 +08:00
momo
ae2c41364f fix:删除订单 2023-10-07 18:36:59 +08:00
laodaming
0350315354 fix 2023-10-07 18:09:17 +08:00
laodaming
d4867a7089 删除产品服务不用的接口 2023-10-07 17:42:34 +08:00
laodaming
e46ac8ff63 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 17:08:01 +08:00
laodaming
734c4e9102 fix 2023-10-07 17:07:53 +08:00
eson
da162f859e Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-10-07 16:59:56 +08:00
eson
586e02c842 info address used 2023-10-07 16:59:52 +08:00
laodaming
560bc9a7d2 fix 2023-10-07 16:58:22 +08:00
laodaming
66acaa6095 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:25:45 +08:00
laodaming
e042cf209d 11 2023-10-07 16:25:39 +08:00
momo
9cfdfdbc77 fix 2023-10-07 16:14:46 +08:00
momo
342d1f99ec Merge branches 'develop' and 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 16:12:35 +08:00
momo
7301463857 fix:优化订单自动取消 2023-10-07 16:12:29 +08:00
laodaming
7fa7b868ca 11 2023-10-07 16:10:51 +08:00
laodaming
67fe103ac1 11 2023-10-07 16:03:54 +08:00
laodaming
9858300984 11 2023-10-07 15:44:44 +08:00
momo
6cdb8b6e6b fix 2023-10-07 15:42:25 +08:00
momo
a8a7132a66 Merge branches 'develop' and 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 15:39:19 +08:00
momo
1f46911f51 fix 2023-10-07 15:38:59 +08:00
laodaming
b0203593bb 11 2023-10-07 15:36:57 +08:00
laodaming
f980520ba7 11 2023-10-07 15:16:49 +08:00
laodaming
550ca5b7b9 11 2023-10-07 15:16:26 +08:00
laodaming
9dbcf33cb9 11 2023-10-07 15:15:16 +08:00
laodaming
7d3f614356 11 2023-10-07 15:09:49 +08:00
laodaming
6a35779bd5 11 2023-10-07 15:00:41 +08:00
laodaming
a9bb36d394 fix 2023-10-07 14:30:44 +08:00
laodaming
87dd183279 fix 2023-10-07 14:24:57 +08:00
momo
ce35498c7e fix调整 2023-10-07 13:41:06 +08:00
laodaming
fdd6ac9b44 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 12:06:27 +08:00
laodaming
a10d41405b fix 2023-10-07 12:06:21 +08:00
momo
c2f61fc61a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-10-07 11:32:16 +08:00
momo
122d558765 fix:合图调整 2023-10-07 11:32:11 +08:00
laodaming
d113ef1c6e fix 2023-10-07 11:24:18 +08:00
laodaming
aafcbfcf50 fix 2023-10-07 10:43:33 +08:00
laodaming
cc6da9a648 fix 2023-10-07 10:13:15 +08:00
momo
821c2063c9 fix:支付 2023-09-28 18:04:35 +08:00
momo
e991ee3966 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-28 17:53:46 +08:00
momo
642ca772e8 fix:支付 2023-09-28 17:53:41 +08:00
eson
f7d0a6422e info address used 2023-09-28 17:06:38 +08:00
eson
989b2daacc info get profile 2023-09-28 16:47:02 +08:00
eson
db0c8a2532 info get profile 2023-09-28 15:26:02 +08:00
eson
6072341a2b info get profile 2023-09-28 14:42:26 +08:00
eson
91bc3310a1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-28 13:25:12 +08:00
eson
d92c77766c info get profile 2023-09-28 13:25:06 +08:00
momo
7573f9ccf6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-28 10:00:08 +08:00
momo
5ecb8537c2 fix:支付 2023-09-28 09:59:53 +08:00
laodaming
06ab4a596f fix 2023-09-27 18:35:20 +08:00
laodaming
fbeebabf27 fix 2023-09-27 17:52:03 +08:00
momo
39efb7eefb Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 17:24:05 +08:00
momo
fef541dfe5 fix:支付 2023-09-27 17:23:58 +08:00
laodaming
8bce140dd2 fix 2023-09-27 17:10:17 +08:00
laodaming
60749646e2 fix 2023-09-27 17:03:15 +08:00
laodaming
13420cd400 fix 2023-09-27 17:01:30 +08:00
laodaming
50c5e28381 fix 2023-09-27 16:51:29 +08:00
laodaming
1dfa390557 fix 2023-09-27 16:16:33 +08:00
laodaming
e917792988 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 16:01:33 +08:00
laodaming
b6d4d06c25 fix 2023-09-27 16:01:22 +08:00
eson
31b712784f info get profile 2023-09-27 15:48:13 +08:00
eson
89e8b4cff9 info get profile 2023-09-27 15:46:35 +08:00
eson
2f4f59d6ab Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 15:37:06 +08:00
eson
43752954ae info get profile 2023-09-27 15:37:02 +08:00
laodaming
9e2526405f fix 2023-09-27 15:12:18 +08:00
laodaming
d5e5f7e6e2 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 14:05:34 +08:00
laodaming
02f2e08329 fix 2023-09-27 14:05:26 +08:00
eson
3dc822fcde info get profile 2023-09-27 12:28:53 +08:00
eson
8654ab3ecd Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 12:04:57 +08:00
eson
82ce9a5114 info get profile 2023-09-27 12:04:53 +08:00
laodaming
788dbd325e fix 2023-09-27 11:57:10 +08:00
laodaming
840f7c8675 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-27 11:48:22 +08:00
laodaming
4ea3487043 fix 2023-09-27 11:48:15 +08:00
eson
4e45e1e393 info get profile 2023-09-27 11:47:38 +08:00
eson
9de1099b12 info get profile 2023-09-27 11:35:34 +08:00
eson
899db716f1 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-27 11:30:22 +08:00
eson
2eadff7876 info get profile 2023-09-27 11:30:17 +08:00
laodaming
0967df9113 fix 2023-09-27 11:23:22 +08:00
laodaming
36ae64f3e7 fix 2023-09-27 11:21:16 +08:00
laodaming
ab916ac13d fix 2023-09-27 11:13:37 +08:00
laodaming
2d0b23e063 fix 2023-09-26 18:38:36 +08:00
laodaming
01b78a099a fix 2023-09-26 18:35:27 +08:00
momo
fcfea291e5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-09-26 18:21:13 +08:00
momo
1203c087d8 fix:支付 2023-09-26 18:18:48 +08:00
eson
91c1c580f9 info get profile 2023-09-26 18:03:29 +08:00
eson
54613f5be0 info get profile 2023-09-26 17:45:07 +08:00
eson
194dc50eaa info get profile 2023-09-26 17:20:44 +08:00
eson
93b0cadea9 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 17:16:15 +08:00
eson
f387e46977 info get profile 2023-09-26 17:16:10 +08:00
laodaming
15888a953b fix 2023-09-26 17:08:49 +08:00
laodaming
76f4a682ac fix 2023-09-26 17:01:31 +08:00
laodaming
d07350969f fix 2023-09-26 16:36:35 +08:00
laodaming
42bd585fe9 fix 2023-09-26 16:20:53 +08:00
laodaming
821cbb8879 fix 2023-09-26 15:28:17 +08:00
eson
4dfeebeaed Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 15:02:13 +08:00
eson
31debda97f info update profile 2023-09-26 15:02:09 +08:00
laodaming
a1d78b7a0c fix 2023-09-26 14:56:32 +08:00
laodaming
03cbe2894e fix 2023-09-26 14:48:49 +08:00
laodaming
82fc0f2b80 fix 2023-09-26 14:46:12 +08:00
laodaming
2747c9ddd9 fix 2023-09-26 14:38:34 +08:00
eson
85cd2bff8d Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-09-26 13:23:55 +08:00