Commit Graph

1060 Commits

Author SHA1 Message Date
laodaming
57c61e5921 fix 2023-08-24 12:24:24 +08:00
laodaming
dca54ee2b7 fix 2023-08-24 12:18:04 +08:00
laodaming
aa89a74c2b fix 2023-08-24 12:04:58 +08:00
laodaming
58f49dfd76 fix 2023-08-24 12:00:44 +08:00
laodaming
98c50565e6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-24 11:56:17 +08:00
laodaming
78ceb147c5 fix 2023-08-24 11:56:10 +08:00
eson
bcd79f828c Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-24 11:47:39 +08:00
eson
d8ddad6fe9 修复json的类型影响 2023-08-24 11:47:22 +08:00
laodaming
2c41f59064 fix 2023-08-24 11:43:16 +08:00
laodaming
724b842167 fix 2023-08-24 11:38:42 +08:00
laodaming
6a45b1e1e7 fix 2023-08-24 11:27:53 +08:00
laodaming
002444ff82 fix 2023-08-24 11:03:46 +08:00
laodaming
db315accee fix 2023-08-24 11:03:33 +08:00
laodaming
810949c9d8 fix 2023-08-23 18:34:01 +08:00
laodaming
41909b7def fix 2023-08-23 18:18:44 +08:00
laodaming
6babc1c5cd Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 18:16:19 +08:00
laodaming
d349fe3197 fix 2023-08-23 18:16:12 +08:00
momo
5443ad654c fix:裁剪业务逻辑调整 2023-08-23 17:51:51 +08:00
laodaming
b2460bbc87 fix 2023-08-23 17:35:43 +08:00
laodaming
2cca06789a fix 2023-08-23 17:03:04 +08:00
laodaming
500611236e fix 2023-08-23 16:57:18 +08:00
momo
b68da2e68a fix:裁剪业务逻辑调整 2023-08-23 16:53:43 +08:00
laodaming
2321c5be77 fix 2023-08-23 16:45:01 +08:00
laodaming
a8457b7dad fix 2023-08-23 16:13:14 +08:00
laodaming
70544827cd fix 2023-08-23 15:54:02 +08:00
laodaming
3defd9a145 fix 2023-08-23 15:35:58 +08:00
laodaming
dc7dc7e1b9 fix 2023-08-23 15:21:50 +08:00
laodaming
ab5004885a fix 2023-08-23 15:20:37 +08:00
laodaming
24db7eb68a fix 2023-08-23 15:12:52 +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
laodaming
be6b6a5076 fix 2023-08-23 14:28:35 +08:00
laodaming
0457da48c4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 14:24:31 +08:00
laodaming
d93a9da8e6 fix 2023-08-23 14:24:24 +08:00
momo
eb3828a86a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 14:23:14 +08:00
momo
89d8a8963c fix:裁剪业务逻辑调整 2023-08-23 14:22:36 +08:00
laodaming
a1fdbcc392 fix 2023-08-23 14:05:49 +08:00
laodaming
a72aa2feca fix 2023-08-23 12:29:59 +08:00
laodaming
41caa6db64 fix 2023-08-23 12:29:02 +08:00
momo
c942855683 fix:裁剪业务逻辑调整 2023-08-23 11:55:52 +08:00
momo
bf36829760 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 11:41:14 +08:00
momo
1e25f79d4a fix:裁剪业务逻辑调整 2023-08-23 11:41:02 +08:00
laodaming
8a715aac26 fix 2023-08-23 11:24:33 +08:00
momo
7f23905e76 fix:裁剪业务逻辑调整 2023-08-23 11:24:02 +08:00
momo
9ccd84abdd fix:裁剪业务逻辑调整 2023-08-23 11:23:26 +08:00
momo
9460504488 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-23 11:09:26 +08:00
momo
2ef3547724 fix:裁剪业务逻辑调整 2023-08-23 11:09:14 +08:00
laodaming
3593d32fb3 fix 2023-08-23 11:03:45 +08:00
laodaming
d5f33433c3 fix 2023-08-23 10:49:54 +08:00
laodaming
79b06c6c7d fix 2023-08-23 10:42:09 +08:00
laodaming
d7ff6f24c2 fix 2023-08-23 10:39:23 +08:00
laodaming
0a635e5113 fix 2023-08-23 10:06:17 +08:00
laodaming
3e7b4e9c4b fix 2023-08-22 18:37:49 +08:00
laodaming
7682843f3e fix 2023-08-22 18:31:25 +08:00
laodaming
0fab87065b fix 2023-08-22 18:24:24 +08:00
laodaming
f3f1de9961 fix 2023-08-22 18:22:27 +08:00
laodaming
425ad8be2c fix 2023-08-22 17:14:43 +08:00
laodaming
0001ea89f2 fix 2023-08-22 17:12:30 +08:00
eson
6313c37ec0 Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop 2023-08-22 16:27:20 +08:00
eson
c6eb43b513 fix 2023-08-22 16:27:05 +08:00
laodaming
09f1758ad5 fix 2023-08-22 16:20:45 +08:00
laodaming
4df65a3b55 fix 2023-08-22 16:07:05 +08:00
eson
98f9c4396d fix 2023-08-22 14:24:40 +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
laodaming
4811b9e4c2 fix 2023-08-22 12:21:31 +08:00
laodaming
0fd64a27bd fix 2023-08-22 12:16:02 +08:00
laodaming
592690c531 fix 2023-08-22 12:01:36 +08:00
laodaming
adf934faa1 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 11:49:03 +08:00
laodaming
36c1773cdd fix 2023-08-22 11:48:57 +08:00
momo
462ac4915b fix:base上传强制更新 2023-08-22 10:54:33 +08:00
momo
0440bd02a4 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:48:23 +08:00
momo
80a9517a1f fix:base上传强制更新 2023-08-22 10:48:10 +08:00
laodaming
efe5f01bb5 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:36:44 +08:00
laodaming
bfa1d53b44 fix 2023-08-22 10:36:38 +08:00
eson
d35ffd793a Merge branch 'develop' into feature/auth 2023-08-22 10:34:21 +08:00
momo
0857ecfd15 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-22 10:16:10 +08:00
momo
988f6c2537 fix 2023-08-22 10:16:03 +08:00
laodaming
f6d2cf3ee8 fix 2023-08-22 10:10:44 +08:00
momo
7cd2192135 fix 2023-08-22 10:00:12 +08:00
momo
1dd0c78868 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 19:01:53 +08:00
momo
2ee1b53f22 fix 2023-08-21 19:01:33 +08:00
laodaming
4216f3906c fix 2023-08-21 18:10:23 +08:00
laodaming
a5dcc5e89c fix 2023-08-21 18:05:51 +08:00
laodaming
1c0a537a09 fix 2023-08-21 18:01:12 +08:00
laodaming
c2caccd8e2 fix 2023-08-21 17:45:51 +08:00
laodaming
f8bb4dff17 fix 2023-08-21 16:19:30 +08:00
laodaming
abdd263c44 fix 2023-08-21 15:30:52 +08:00
laodaming
72f07745b6 fix 2023-08-21 15:27:53 +08:00
laodaming
ec96c10706 fix 2023-08-21 15:24:24 +08:00
laodaming
4523274443 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 14:46:46 +08:00
laodaming
c19f4ba6d2 fix 2023-08-21 14:46:39 +08:00
momo
5e251e9868 fix 2023-08-21 14:39:03 +08:00
momo
94d93bf390 fix 2023-08-21 14:06:24 +08:00
momo
23d68effd4 fix:文件上传大小限制 2023-08-21 13:42:11 +08:00
momo
bd092f44c8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-21 13:35:40 +08:00
momo
0e3ac4cb77 fix:文件上传大小限制 2023-08-21 13:35:31 +08:00
laodaming
46ce6ded3c fix 2023-08-21 13:19:12 +08:00
laodaming
e2744a54f2 fix 2023-08-21 11:27:17 +08:00
laodaming
feae3ada33 fix 2023-08-21 11:25:56 +08:00
laodaming
0990644b4a fix 2023-08-21 10:53:21 +08:00
laodaming
346ffd1620 fix 2023-08-21 10:27:25 +08:00
laodaming
6a912a145e fix 2023-08-21 10:21:02 +08:00
laodaming
bc6959bc9a fix 2023-08-21 09:57:57 +08:00
laodaming
565b6909cf Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 19:34:26 +08:00
eson
3f9c050ca5 test 2023-08-18 19:34:23 +08:00
laodaming
65b2519f52 fix 2023-08-18 19:34:18 +08:00
Hiven
e11d777f18 fix:图片裁剪 2023-08-18 18:55:56 +08:00
Hiven
ca645368aa Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 18:27:18 +08:00
Hiven
e36f688c03 fix:图片裁剪 2023-08-18 18:27:10 +08:00
laodaming
ccaca2ae07 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:52:25 +08:00
laodaming
5c7d1bb6b0 fix 2023-08-18 17:52:19 +08:00
Hiven
588b07915b fix:图片裁剪 2023-08-18 17:41:21 +08:00
Hiven
2e3a431474 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:38:16 +08:00
Hiven
fa97e20ae1 fix:图片裁剪 2023-08-18 17:38:12 +08:00
laodaming
75aacbcc65 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:33:52 +08:00
laodaming
8da61f90e4 fix 2023-08-18 17:33:42 +08:00
Hiven
60e4713806 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 17:16:54 +08:00
Hiven
cba012a2b0 fix:上传大图限制 2023-08-18 17:16:49 +08:00
laodaming
4f1bb51d8f fix 2023-08-18 17:08:56 +08:00
laodaming
1bde6e5d53 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 16:58:36 +08:00
laodaming
5af797eeae fix 2023-08-18 16:58:30 +08:00
Hiven
7807033c1a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-18 16:47:33 +08:00
Hiven
05137f3fe5 fix:上传大图限制 2023-08-18 16:47:22 +08:00
laodaming
1309473d7b fix 2023-08-18 16:23:04 +08:00
laodaming
2d498a06a0 fix 2023-08-18 16:21:45 +08:00
laodaming
62afaeda07 fix 2023-08-18 16:20:45 +08:00
laodaming
b8ca7360b1 fix 2023-08-18 16:15:44 +08:00
laodaming
04982bae18 fix 2023-08-18 16:03:29 +08:00
laodaming
a19d526e72 fix 2023-08-18 15:02:08 +08:00
laodaming
4060b5775b fix 2023-08-18 14:59:23 +08:00
laodaming
868f9a4192 fix 2023-08-18 14:57:21 +08:00
laodaming
f8c86b1f03 fix 2023-08-18 12:30:53 +08:00
laodaming
d0692bbf88 fix 2023-08-18 12:06:59 +08:00
laodaming
6036b23386 fix 2023-08-18 11:43:50 +08:00
laodaming
21db59c507 fix 2023-08-18 11:42:24 +08:00
laodaming
f519e27719 fix 2023-08-18 11:41:36 +08:00
laodaming
530d711f75 fix 2023-08-18 11:05:18 +08:00
laodaming
37d32a26ab fix 2023-08-18 10:26:33 +08:00
laodaming
430cd22dc3 fix 2023-08-17 18:22:09 +08:00
laodaming
d760f4e28c fix 2023-08-17 18:22:00 +08:00
laodaming
f892a216d6 fix 2023-08-17 18:19:15 +08:00
laodaming
a28fbd2aa6 fix 2023-08-17 16:50:44 +08:00
laodaming
7eea85e49d fix 2023-08-17 16:28:15 +08:00
laodaming
5ab2bb51e2 fix 2023-08-17 16:22:26 +08:00
laodaming
509e82db63 fix 2023-08-17 16:17:25 +08:00
laodaming
cda5c69f4f fix 2023-08-17 16:16:27 +08:00
laodaming
6dba8507a7 fix 2023-08-17 16:11:09 +08:00
laodaming
17556690ed fix 2023-08-17 16:07:27 +08:00
laodaming
1c2ab8c645 fix 2023-08-17 15:54:21 +08:00
laodaming
784d8f2624 fix 2023-08-17 15:54:03 +08:00
laodaming
5bde276c6d fix 2023-08-17 15:41:54 +08:00
laodaming
200680f85f fix 2023-08-17 15:39:37 +08:00
laodaming
3b757b0dab fix 2023-08-17 15:35:17 +08:00
laodaming
76fecbde7e fix 2023-08-17 15:29:54 +08:00
laodaming
6fdc784a9d fix 2023-08-17 15:22:09 +08:00
laodaming
666147cfe6 fix 2023-08-17 15:11:32 +08:00
laodaming
05f61fc8b2 fix 2023-08-17 14:48:27 +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
d59131af4b fix 2023-08-17 12:14:38 +08:00
Hiven
c1fddf2a14 fix:上传模块调整 2023-08-17 12:14:19 +08:00
Hiven
8996424556 fix:上传模块调整 2023-08-17 11:51:05 +08:00
laodaming
d2c8fa9020 fix 2023-08-17 11:49:31 +08:00
Hiven
98c5eae6ee Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-17 11:46:31 +08:00
Hiven
c3cd57b7e5 fix:上传模块调整 2023-08-17 11:46:17 +08:00
laodaming
5b4dd9f360 fix 2023-08-17 11:44:18 +08:00
laodaming
3ed2e0e06c fix 2023-08-17 11:36:41 +08:00
Hiven
a80a71255a Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-17 11:29:38 +08:00
Hiven
69030d31de fix:重构合图模块 2023-08-17 11:29:32 +08:00
laodaming
8de81859d2 fix 2023-08-17 11:15:42 +08:00
laodaming
be95ff9d05 fix 2023-08-17 11:14:47 +08:00
laodaming
748b7e5b66 fix 2023-08-17 11:11:58 +08:00
laodaming
757a7fb0b4 fix 2023-08-17 11:09:59 +08:00
laodaming
b222579633 fix 2023-08-17 10:39:02 +08:00
laodaming
07dbf5eb6d fix 2023-08-16 17:48:03 +08:00
laodaming
2714ffd0d8 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-16 17:36:36 +08:00
laodaming
1a0286a1cb fix 2023-08-16 17:36:25 +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
laodaming
d3220e2461 fix 2023-08-16 17:10:22 +08:00
laodaming
5bafc6cc43 fix 2023-08-16 17:07:53 +08:00
laodaming
886e765d4b fix 2023-08-16 17:06:52 +08:00
laodaming
c692d74442 fix 2023-08-16 17:04:45 +08:00
laodaming
4d215beabc fix 2023-08-16 16:55:31 +08:00
laodaming
c8ff11b633 fix 2023-08-16 16:26:44 +08:00
laodaming
d0bd037d7b fix 2023-08-16 16:20:16 +08:00
laodaming
c5dd4866b9 fix 2023-08-16 15:46:10 +08:00
laodaming
2b05154fc4 fix 2023-08-16 15:42:46 +08:00
laodaming
ca1faa7ace fix 2023-08-16 15:39:14 +08:00
laodaming
dc4c87b323 fix 2023-08-16 15:38:17 +08:00
laodaming
6e78e4f209 fix 2023-08-16 14:29:25 +08:00
laodaming
7d2c2ab025 fix 2023-08-16 14:16:33 +08:00
laodaming
7bdd1f00af fix 2023-08-16 14:09:03 +08:00
laodaming
37b5cc0f30 fix 2023-08-16 12:33:01 +08:00
laodaming
a022e5a8d9 fix 2023-08-16 12:16:23 +08:00
laodaming
b11e768550 fix 2023-08-16 10:58:34 +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
ac1800bb26 fix 2023-08-15 19:43:50 +08:00
laodaming
68ed14b373 fix 2023-08-15 18:38:33 +08:00
Hiven
b4a06dc66f Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 18:35:23 +08:00
Hiven
69f08415fc fix:重构合图模块 2023-08-15 18:35:16 +08:00
laodaming
d603cacd0b fix 2023-08-15 18:14:44 +08:00
laodaming
6502f241ab fix 2023-08-15 17:40:27 +08:00
laodaming
12b1905f11 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 17:36:23 +08:00
laodaming
8d0a675dd9 fix 2023-08-15 17:36:17 +08:00
Hiven
318f92b869 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 17:19:14 +08:00
Hiven
cebd92becd fix:重构合图模块 2023-08-15 17:19:05 +08:00
laodaming
35cb2ef1ce fix 2023-08-15 17:10:43 +08:00
laodaming
7542c35184 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 16:50:44 +08:00
laodaming
c4dc31493a fix 2023-08-15 16:50:35 +08:00
Hiven
bd8a74701e Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 16:14:54 +08:00
Hiven
ee92561769 fix:重构合图模块 2023-08-15 16:14:49 +08:00
Hiven
10b4b6656f fix:重构合图模块 2023-08-15 16:14:12 +08:00
laodaming
c9dfec717c fix 2023-08-15 15:47:39 +08:00
laodaming
a3015e9fdd fix 2023-08-15 15:09:53 +08:00
laodaming
48cd4b2fea fix 2023-08-15 14:21:32 +08:00
laodaming
f4e3834d95 fix 2023-08-15 14:04:44 +08:00
laodaming
54568173af fix 2023-08-15 13:35:23 +08:00
laodaming
edf89ea301 fix 2023-08-15 12:34:41 +08:00
laodaming
913b529fa1 fix 2023-08-15 11:59:12 +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
f65f5673f8 fix:重构合图模块 2023-08-15 10:58:58 +08:00
Hiven
aa3525c7ce Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-15 10:58:29 +08:00
Hiven
d1c6f5cdc5 fix:重构合图模块 2023-08-15 10:58:24 +08:00
laodaming
f652a98c0e fix 2023-08-14 18:40:34 +08:00
Hiven
b9a95cecf6 Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop 2023-08-14 17:56:11 +08:00
Hiven
05e3853134 fix:重构合图模块 2023-08-14 17:56:06 +08:00
laodaming
24a5bf11a3 fix 2023-08-14 17:31:57 +08:00
laodaming
94a36bd98e fix 2023-08-14 15:58:31 +08:00
laodaming
63a7aa0a3d fix 2023-08-14 15:52:10 +08:00
laodaming
1c03e5bb01 fix 2023-08-14 15:49:24 +08:00
laodaming
50da55d7bb fix 2023-08-14 15:46:28 +08:00
laodaming
357f402031 fix 2023-08-14 15:18:07 +08:00
laodaming
13c6eea1a8 fix 2023-08-14 15:08:24 +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
laodaming
bdd9a70a2d fix 2023-08-14 14:21:14 +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
6844142603 fix 2023-08-14 12:31:49 +08:00
laodaming
35b02302eb fix 2023-08-14 12:30:14 +08:00
laodaming
5bc6f411be fix 2023-08-14 12:05:22 +08:00
laodaming
06e32e6af9 fix 2023-08-14 11:53:16 +08:00
laodaming
aa895fda51 fix 2023-08-14 11:49:02 +08:00