Commit Graph

85 Commits

Author SHA1 Message Date
702dceb375 bug 2024-02-21 17:02:13 +08:00
7c538e5aab bug 2024-02-05 18:09:05 +08:00
9f5d333798 bug 2024-02-04 18:08:43 +08:00
033a66f12d bug 2024-02-04 13:37:04 +08:00
b1b8797ad0 bug 2024-02-03 17:37:34 +08:00
206f171544 bug 2024-02-02 18:02:17 +08:00
63f4fcfbf4 bug 2024-02-02 15:31:02 +08:00
3bf7dc3b70 bug 2024-02-01 17:52:17 +08:00
wangh
c997873f10 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintCashierWeb/src/views/details/index.vue
2024-02-01 11:33:33 +08:00
wangh
d789b8b85a bug修改 2024-02-01 11:31:55 +08:00
273e38494c bug 2024-02-01 10:03:16 +08:00
8a943fdb10 bug 2024-01-31 17:05:12 +08:00
63ca5ca01b bug 2024-01-30 18:36:40 +08:00
79c152ca76 bug 2024-01-30 16:04:49 +08:00
cedf3c7281 bug 2024-01-29 18:18:30 +08:00
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
c1bb1af124 bug 2024-01-26 13:33:09 +08:00
wangh
a09d3208af no message 2024-01-25 10:24:55 +08:00
819624e4e8 bug 2024-01-24 14:35:00 +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
179f49c58f bug 2024-01-22 11:51:12 +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
5c4922d656 bug 2024-01-19 14:54:59 +08:00
2398ead499 bug 2024-01-16 11:30:23 +08:00
298977bb25 bug 2024-01-15 18:17:40 +08:00
wangh
bff603b970 no message 2024-01-13 15:04:45 +08:00
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
wangh
250f000040 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-12 13:58:57 +08:00
wangh
dde91a7108 中台增加订单 2024-01-12 13:58:51 +08:00
2a9b7cae2e bug 2024-01-11 13:55:20 +08:00
wangh
a6cc143bed Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-11 13:34:49 +08:00
wangh
d518ecd277 pc端会员充值修改 2024-01-11 13:34:42 +08:00
a61a99cde7 优化项 2024-01-10 18:09:46 +08:00
wangh
48ce157316 bug 2024-01-10 15:43:57 +08:00
eaa527e109 优化项 2024-01-10 13:45:02 +08:00
431947960b 优化项 2024-01-08 14:45:36 +08:00
6813f67d38 优化项 2024-01-06 18:04:36 +08:00
5979294f18 优化项 2024-01-06 15:47:07 +08:00
683b41e456 优化项 2024-01-06 13:37:21 +08:00
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
eae119f033 优化项 2024-01-05 18:27:59 +08:00
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
wangh
1956d1a25b 自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试(前后端) 2023-12-14 13:36:36 +08:00
wangh
e09841a85a 信息统计 2023-12-09 15:23:37 +08:00
wangh
f50982f0e6 充值订单 2023-12-07 10:22:52 +08:00
d48a4cabe7 会员信息 2023-11-30 18:30:46 +08:00
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00