Commit Graph

578 Commits

Author SHA1 Message Date
f325084e07 一键发券 2024-01-29 10:42:15 +08:00
60ccc78c46 bug 2024-01-29 09:50:28 +08:00
N
285616700b bug 2024-01-28 18:55:43 +08:00
0e40832516 bug 2024-01-27 17:58:07 +08:00
wangh
c4cad9159b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-27 17:51:28 +08:00
wangh
f56fab7e9d bug处理 2024-01-27 17:51:20 +08:00
8dadfa05c3 Merge remote-tracking branch 'origin/master' 2024-01-27 15:45:27 +08:00
d42435fe24 领券bug 2024-01-27 15:45:10 +08:00
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
9d96f86dd6 Merge remote-tracking branch 'origin/master' 2024-01-27 13:56:05 +08:00
39bcd86010 领券bug 2024-01-27 13:55:55 +08:00
de750590f1 bug 2024-01-27 11:35:35 +08:00
32cb50848f bug 2024-01-27 10:51:32 +08:00
cbb0d2b9ae Merge remote-tracking branch 'origin/master' 2024-01-27 10:09:11 +08:00
ba1a17ff85 领券bug 2024-01-27 10:08:26 +08:00
249b30da4d bug 2024-01-27 09:05:50 +08:00
wangh
a89ca421cd Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-26 16:57:35 +08:00
wangh
50dcb6898c 验证码登录 2024-01-26 16:57:27 +08:00
c1bb1af124 bug 2024-01-26 13:33:09 +08:00
wangh
84091da9d5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-26 10:49:06 +08:00
wangh
bb13e3bd35 验证openId 2024-01-26 10:48:51 +08:00
d54ef244a8 bug 2024-01-25 18:27:19 +08:00
wangh
3d3ea7ba06 no message 2024-01-25 16:48:08 +08:00
4f071179af 领券bug 2024-01-25 16:20:17 +08:00
0fe4d0d202 bug 2024-01-25 15:49:18 +08:00
96af32a2dd Merge remote-tracking branch 'origin/master' 2024-01-25 15:42:24 +08:00
cb282e356b 领券bug 2024-01-25 15:42:16 +08:00
fced742168 bug 2024-01-25 13:19:17 +08:00
wangh
0760093344 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-25 10:25:02 +08:00
wangh
a09d3208af no message 2024-01-25 10:24:55 +08:00
6976d3e7ce bug 2024-01-25 10:13:43 +08:00
db25cf1b23 Merge remote-tracking branch 'origin/master' 2024-01-24 17:39:06 +08:00
5cad54a5d0 领券bug 2024-01-24 17:38:57 +08:00
wangh
661fb65605 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-24 17:33:02 +08:00
wangh
f4f9ec07ff no message 2024-01-24 17:32:57 +08:00
803e28bdcd bug 2024-01-24 17:10:37 +08:00
0c151ad2b2 Merge remote-tracking branch 'origin/master' 2024-01-24 15:22:29 +08:00
8215f03ac9 bug 2024-01-24 15:22:16 +08:00
wangh
e423293f5c Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-24 15:07:35 +08:00
wangh
13af4ffd80 打印 2024-01-24 15:07:26 +08:00
819624e4e8 bug 2024-01-24 14:35:00 +08:00
cf631ad033 bug 2024-01-23 18:14:56 +08:00
wangh
3646bc94b9 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-23 14:19:42 +08:00
wangh
5aa43002fd 打印处理 2024-01-23 14:19:35 +08:00
b1dedd5764 bug 2024-01-23 14:16:17 +08:00
53627e2f41 bug 2024-01-23 11:41:01 +08:00
2e193072eb bug 2024-01-23 11:21:20 +08:00
b6a7befa56 Merge remote-tracking branch 'origin/master' 2024-01-23 10:56:52 +08:00
56892e22bf bug 2024-01-23 10:56:44 +08:00
c2ceb9e13b Merge remote-tracking branch 'origin/master' 2024-01-23 10:45:30 +08:00
937fcee22f Merge remote-tracking branch 'origin/master' 2024-01-23 10:42:20 +08:00
49ac39e908 bug 2024-01-23 10:42:12 +08:00
3a6f73f33e bug 2024-01-23 09:55:23 +08:00
25cd5cb003 bug 2024-01-23 09:26:10 +08:00
a43012cda0 bug 2024-01-22 18:05:19 +08:00
0d16fe2c8d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
2024-01-22 14:26:39 +08:00
f16d31ca40 bug 2024-01-22 14:26:01 +08:00
cadb4ce475 bug 2024-01-22 14:25:45 +08:00
8e893ae4d4 bug 2024-01-22 13:29:42 +08:00
179f49c58f bug 2024-01-22 11:51:12 +08:00
63ec546d5c bug 2024-01-22 10:32:13 +08:00
196d7f41ad bug 2024-01-22 10:09:43 +08:00
1d09b0b4c2 bug 2024-01-22 09:22:50 +08:00
32c78a40e0 bug 2024-01-22 09:05:18 +08:00
be13af873d 本站活动 2024-01-20 18:20:09 +08:00
af1a1a25f0 bug 2024-01-20 18:11:29 +08:00
83a0e8367a 本站活动 2024-01-20 13:55:05 +08:00
ba181d2ce7 Merge remote-tracking branch 'origin/master' 2024-01-20 12:01:21 +08:00
acc85b1fa6 111 2024-01-20 12:01:11 +08:00
fcb8ddb9ca bug 2024-01-20 11:48:52 +08:00
3cc44f8272 111 2024-01-20 11:14:29 +08:00
3df54fd625 Merge remote-tracking branch 'origin/master' 2024-01-20 10:44:46 +08:00
397108077b 111 2024-01-20 10:44:36 +08:00
06fcb5fe98 bug 2024-01-19 18:48:13 +08:00
wangh
662f21012d Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-19 18:32:13 +08:00
wangh
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
6c1257e605 111 2024-01-19 18:18:27 +08:00
4dc2c4d5ca 满减折扣活动记录 2024-01-19 17:36:51 +08:00
974264984f bug 2024-01-19 16:02:17 +08:00
6a7af98bec bug 2024-01-19 15:36:45 +08:00
5c4922d656 bug 2024-01-19 14:54:59 +08:00
62da5301d3 Merge remote-tracking branch 'origin/master' 2024-01-19 14:28:40 +08:00
f467023ba0 bug 2024-01-19 14:28:32 +08:00
8d249e7e5e bug 2024-01-19 13:44:13 +08:00
bd213aa77b bug 2024-01-19 13:08:30 +08:00
3ef9ad404b bug 2024-01-19 11:33:51 +08:00
3cc355b4b9 Merge remote-tracking branch 'origin/master' 2024-01-19 11:04:55 +08:00
3411d1d78e bug 2024-01-19 11:04:41 +08:00
9160829356 bug 2024-01-19 10:43:11 +08:00
f5805e7659 Merge remote-tracking branch 'origin/master' 2024-01-19 10:28:03 +08:00
1774597789 bug 2024-01-19 10:27:49 +08:00
wangh
93d27e996e Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-19 10:15:57 +08:00
wangh
130f002dd1 商户号退款 2024-01-19 10:15:32 +08:00
de97c7d2fd Merge remote-tracking branch 'origin/master' 2024-01-19 09:51:16 +08:00
0041201480 bug 2024-01-19 09:51:07 +08:00
1c806f5c4d bug 2024-01-18 18:15:24 +08:00
98ff3486a8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
2024-01-18 18:07:27 +08:00
9a96d26d8d 付款 活动最佳优惠接口 2024-01-18 18:06:38 +08:00
wangh
0fe66f0d65 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-18 18:06:12 +08:00
wangh
66910b4bf4 bug处理 2024-01-18 18:06:07 +08:00