wangh
|
0ed07ccd49
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2024-01-13 13:24:02 +08:00 |
|
wangh
|
5d9de0a0dc
|
bug修改
|
2024-01-13 13:22:10 +08:00 |
|
|
686a0d2e03
|
bug
|
2024-01-12 18:03:02 +08:00 |
|
wangh
|
1a5bb54d36
|
修改中台用户管理增加和修改的bug
|
2024-01-10 13:46:27 +08:00 |
|
wangh
|
3054607717
|
bug修改
|
2024-01-09 17:09:45 +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 |
|
|
53a7cce4dc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-29 13:40:44 +08:00 |
|
|
78fb118550
|
充值记录
|
2023-12-29 13:38:00 +08:00 |
|
wangh
|
c9dbe51f22
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-27 09:11:48 +08:00 |
|
wangh
|
0f7c14444d
|
完善站长一键登录+修改中台出现的bug
|
2023-12-27 09:11:43 +08:00 |
|
|
53288a6e77
|
意见反馈
|
2023-12-26 18:44:50 +08:00 |
|
wangh
|
22d78d8b5f
|
小票打印--积分支付--中台设置流水
|
2023-12-26 09:50:37 +08:00 |
|
wangh
|
087ce92cbf
|
中台处理
|
2023-12-22 15:33:38 +08:00 |
|
wangh
|
89bf856d96
|
no message
|
2023-12-19 16:54:46 +08:00 |
|
wangh
|
e96aac959e
|
修改充值流程-适配mq+rocketutil
|
2023-12-14 13:28:36 +08:00 |
|
wangh
|
8021669f4c
|
rockermq记录表的增删改查+rocket引入+redis锁
|
2023-12-14 13:25:11 +08:00 |
|
wangh
|
841b823692
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2023-12-09 15:27:17 +08:00 |
|
wangh
|
e09841a85a
|
信息统计
|
2023-12-09 15:23:37 +08:00 |
|
|
6451143ec3
|
订单信息
|
2023-12-07 18:28:31 +08:00 |
|
wangh
|
abe9969d75
|
修改
|
2023-12-05 13:44:15 +08:00 |
|
wangh
|
78c6d5d5d9
|
no message
|
2023-12-01 15:42:23 +08:00 |
|
wangh
|
ed40ec677e
|
no message
|
2023-11-30 11:37:32 +08:00 |
|
wangh
|
9ff4038838
|
登录接口
|
2023-11-30 11:07:26 +08:00 |
|
wangh
|
c5d44f4d22
|
no message
|
2023-11-29 17:41:11 +08:00 |
|
wangh
|
01641bbae2
|
no message
|
2023-11-29 17:37:42 +08:00 |
|
|
d4b1d72608
|
会员信息
|
2023-11-29 16:56:28 +08:00 |
|
wangh
|
f45dfbd0de
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/CardManagement/CardManagement.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/Recharge/Recharge.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/feedback/feedback.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/invite/invite.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/writeOff/writeOff.js.map
|
2023-11-29 16:50:42 +08:00 |
|
wangh
|
28a26db27c
|
1
|
2023-11-29 16:48:44 +08:00 |
|
|
491c8bf426
|
会员信息
|
2023-11-29 16:26:19 +08:00 |
|
wangh
|
7073e91a34
|
1
|
2023-11-29 14:03:47 +08:00 |
|
wangh
|
b25c52f6de
|
登录修改
|
2023-11-29 11:50:58 +08:00 |
|
wangh
|
195a7298e0
|
1
|
2023-11-28 18:10:16 +08:00 |
|
|
f30a3556e3
|
收银台
|
2023-11-27 18:28:41 +08:00 |
|
|
492179cb24
|
修改Bug
|
2023-11-25 14:41:54 +08:00 |
|
|
92d425f57c
|
手机验证码登录
|
2023-11-24 17:24:10 +08:00 |
|
|
d8e82d2bb8
|
兑换券
|
2023-11-07 09:04:02 +08:00 |
|
|
f8bf519927
|
便利店
|
2023-10-28 10:17:57 +08:00 |
|
|
b0b04f4349
|
处理
|
2023-10-25 14:40:20 +08:00 |
|
|
ab6a4a5279
|
会员管理
|
2023-10-19 18:47:09 +08:00 |
|
|
4e88af4a80
|
处理
|
2023-10-19 17:32:43 +08:00 |
|
|
5828f02c35
|
处理
|
2023-10-13 16:22:43 +08:00 |
|
|
22a08f5e51
|
处理
|
2023-10-12 17:57:09 +08:00 |
|
|
e711be00e8
|
处理
|
2023-10-12 10:00:52 +08:00 |
|
|
212e2d5cca
|
员工管理
|
2023-10-11 18:45:54 +08:00 |
|
|
c963066385
|
处理
|
2023-10-11 18:37:04 +08:00 |
|
|
ceddee9e85
|
处理
|
2023-10-11 13:22:16 +08:00 |
|
|
ed2035cd52
|
处理
|
2023-10-10 09:09:01 +08:00 |
|
|
1437fa9ed7
|
init
|
2023-10-09 11:12:49 +08:00 |
|