dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
872 Commits 2 Branches 0 Tags 190 MiB
8b907e9ad0
Commit Graph

551 Commits

Author SHA1 Message Date
wangh
a3ed2f8b2d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-08 10:07:57 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +08:00
cun-nan
6ef091cd6c 优化项 2024-01-08 09:18:42 +08:00
cun-nan
6813f67d38 优化项 2024-01-06 18:04:36 +08:00
wangh
ca91fa5b5a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-06 15:51:55 +08:00
wangh
a345536e57 no message 2024-01-06 15:51:41 +08:00
cun-nan
5979294f18 优化项 2024-01-06 15:47:07 +08:00
wangh
214ab014ec Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
#	fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
 2024-01-06 15:13:27 +08:00
wangh
e267ba63fe bug修改 2024-01-06 15:06:58 +08:00
cun-nan
683b41e456 优化项 2024-01-06 13:37:21 +08:00
@QQNZX
14f1b6fdd4 前端 2024-01-06 10:42:41 +08:00
cun-nan
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
cun-nan
eae119f033 优化项 2024-01-05 18:27:59 +08:00
齐天大圣
13a435eb17 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
 2024-01-05 18:20:49 +08:00
齐天大圣
d92c33373a 修改bug 2024-01-05 18:19:48 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
齐天大圣
85dbca19b3 Merge remote-tracking branch 'origin/master' 2024-01-05 15:12:01 +08:00
齐天大圣
2b6d0a3a73 修改bug 2024-01-05 15:11:53 +08:00
wangh
0ffa106329 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
 2024-01-05 14:30:27 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
齐天大圣
2deb719e4b 修改bug 2024-01-05 14:02:58 +08:00
齐天大圣
18eaab3435 Merge remote-tracking branch 'origin/master' 2024-01-05 09:20:23 +08:00
齐天大圣
bf724adf18 修改bug 2024-01-05 09:20:12 +08:00
cun-nan
cf1c679d19 优化项 2024-01-05 09:17:23 +08:00
cun-nan
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
302c39b3dc Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/pages/index/index.vue
 2024-01-04 15:55:48 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
齐天大圣
8792a11183 修改bug 2024-01-04 15:01:20 +08:00
齐天大圣
2cb89c7776 修改bug 2024-01-04 14:00:45 +08:00
齐天大圣
d1566ef1ce 修改bug 2024-01-04 13:32:09 +08:00
齐天大圣
d6df89b3aa Merge remote-tracking branch 'origin/master' 2024-01-04 12:05:09 +08:00
齐天大圣
5b1c86be9b 修改bug 2024-01-04 12:04:59 +08:00
wangh
6bf929b433 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-04 09:10:15 +08:00
wangh
61d8947fd1 bug修改 2024-01-04 09:09:58 +08:00
齐天大圣
876c391ef8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
 2024-01-03 18:46:31 +08:00
齐天大圣
4fa7be30bd 修改bug 2024-01-03 18:45:35 +08:00
cun-nan
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
齐天大圣
93e3d51e5b 修改bug 2024-01-03 16:02:45 +08:00
齐天大圣
a529c7e67e 修改bug 2024-01-03 15:43:34 +08:00
齐天大圣
99767393bc 修改bug 2024-01-03 13:39:21 +08:00
齐天大圣
a897807c16 修改bug 2024-01-03 10:54:36 +08:00
齐天大圣
a9b86ff520 Merge remote-tracking branch 'origin/master' 2024-01-03 09:12:08 +08:00
齐天大圣
5d2b98d6fa 修改bug 2024-01-03 09:11:56 +08:00
cun-nan
b5d55b69f1 优化项 2024-01-02 18:36:47 +08:00
cun-nan
76befae703 优化项 2024-01-02 17:13:25 +08:00
wangh
eac375458b bug修改 2024-01-02 14:24:47 +08:00
齐天大圣
c86397d612 Merge remote-tracking branch 'origin/master' 2024-01-02 12:45:52 +08:00
齐天大圣
3389960aa5 充值记录 2024-01-02 12:45:39 +08:00
wangh
adfb53bac2 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintBackend/configure/dev/application.properties
#	fuintBackend/fuint-application/src/main/resources/application.properties
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
 2024-01-02 11:29:51 +08:00
wangh
9f3dadf902 no message 2024-01-02 11:22:29 +08:00
wangh
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
@QQNZX
9974798e58 前端 2024-01-02 10:04:57 +08:00
齐天大圣
53062019b4 Merge remote-tracking branch 'origin/master' 2024-01-02 09:18:54 +08:00
齐天大圣
7154546662 充值记录 2024-01-02 09:18:45 +08:00
cun-nan
2bc16929cf 优化项 2023-12-29 18:09:33 +08:00
cun-nan
b5341ed627 首页banner图 2023-12-29 16:50:44 +08:00
cun-nan
a5d998b02d 满减 2023-12-29 15:27:06 +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
cun-nan
830e435b56 子卡信息 2023-12-28 17:31:50 +08:00
cun-nan
cd24222c2a 子卡信息 2023-12-28 13:14:35 +08:00
cun-nan
323add1517 会员信息 2023-12-27 18:44:56 +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
cun-nan
53288a6e77 意见反馈 2023-12-26 18:44:50 +08:00
wangh
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
cun-nan
9edf62a5a2 二维码 2023-12-25 18:10:00 +08:00
齐天大圣
6faf9677e1 充值记录 2023-12-25 15:21:10 +08:00
齐天大圣
dfba5774b0 充值记录 2023-12-25 14:53:08 +08:00
齐天大圣
92aac838c5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
 2023-12-25 14:44:23 +08:00
齐天大圣
42869c8cd7 充值记录 2023-12-25 14:41:17 +08:00
cun-nan
24716f59be 正在使用的商户状态 2023-12-25 11:17:36 +08:00
cun-nan
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
cun-nan
8ab6707977 小程序支付 2023-12-23 09:19:34 +08:00
wangh
5cc1c5bb3f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-22 18:18:25 +08:00
wangh
8148002ce2 no message 2023-12-22 18:18:21 +08:00
齐天大圣
c6d27473ae Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
 2023-12-22 17:02:09 +08:00
齐天大圣
b0aa720ccb 充值记录 2023-12-22 17:01:13 +08:00
cun-nan
b9bac4a4b0 小程序支付 2023-12-22 16:33:34 +08:00
wangh
0c222c88a5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-22 15:34:06 +08:00
wangh
087ce92cbf 中台处理 2023-12-22 15:33:38 +08:00
cun-nan
a96f61ecc8 小程序支付 2023-12-21 18:43:22 +08:00
齐天大圣
536614d596 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/pages/my/my.vue
 2023-12-21 17:49:34 +08:00
齐天大圣
cc69c78e3e 小程序端推荐有礼 2023-12-21 17:48:13 +08:00
cun-nan
8a3ee12f1d 小程序支付 2023-12-20 16:04:56 +08:00
齐天大圣
b5696f8dec Merge remote-tracking branch 'origin/master' 2023-12-20 14:30:54 +08:00
齐天大圣
89010cb79d 小程序端新人有礼活动 2023-12-20 14:30:37 +08:00
wangh
4641b04b65 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-19 16:54:53 +08:00
wangh
89bf856d96 no message 2023-12-19 16:54:46 +08:00
wangh
79a9d8e47e 数据统计 2023-12-19 16:54:02 +08:00
cun-nan
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
齐天大圣
f76021b177 Merge remote-tracking branch 'origin/master' 2023-12-18 17:55:09 +08:00
齐天大圣
65ba434d19 子卡管理 2023-12-18 17:54:43 +08:00
wangh
96f978ae11 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelRecordMapper.java
 2023-12-18 17:43:57 +08:00
wangh
026b7e6d0b 主页的数据统计 2023-12-18 17:42:52 +08:00
齐天大圣
0a4cde035f 子卡管理 2023-12-18 17:32:37 +08:00
齐天大圣
f8a1fdea61 修改小程序端的活动展示方式 2023-12-18 15:10:29 +08:00
齐天大圣
711d4a4e90 核销记录 2023-12-18 11:14:51 +08:00
齐天大圣
79e2d77212 核销记录 2023-12-15 17:41:25 +08:00
齐天大圣
407af8365e 用户余额查询 2023-12-15 13:48:17 +08:00
齐天大圣
69eb9cccb5 Merge remote-tracking branch 'origin/master' 2023-12-14 15:56:43 +08:00
齐天大圣
e0be7fbed7 小程序囤油卡 2023-12-14 15:54:53 +08:00
cun-nan
2c4febc2b7 订单信息 2023-12-14 15:06:24 +08:00
wangh
29b2f0f586 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
 2023-12-14 13:40:31 +08:00
wangh
1956d1a25b 自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端） 2023-12-14 13:36:36 +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
cun-nan
33cfff8e8b 订单信息 2023-12-14 11:04:16 +08:00
cun-nan
217c669407 订单信息 2023-12-13 18:43:50 +08:00
齐天大圣
b429636651 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
 2023-12-13 17:11:02 +08:00
齐天大圣
e00b708435 小程序我的券 2023-12-13 17:09:31 +08:00
wangh
0fab8cd1d4 订单详情页 2023-12-11 09:21:21 +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
齐天大圣
e7299b6613 礼品卡兑换记录 2023-12-09 09:33:48 +08:00
齐天大圣
e7f8a5bfc9 礼品卡兑换记录 2023-12-08 17:01:33 +08:00
齐天大圣
7799b6451d Merge remote-tracking branch 'origin/master' 2023-12-08 16:21:43 +08:00
齐天大圣
785c2eb517 礼品卡兑换记录 2023-12-08 16:21:35 +08:00
cun-nan
4599d08df9 订单信息 2023-12-08 15:48:54 +08:00
齐天大圣
116141d547 礼品卡兑换记录 2023-12-08 15:15:03 +08:00
齐天大圣
4c674b0109 Merge remote-tracking branch 'origin/master' 2023-12-08 13:13:31 +08:00
齐天大圣
9d1eb21787 礼品卡兑换 2023-12-08 13:13:21 +08:00
cun-nan
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
齐天大圣
68c0ab29e7 Merge remote-tracking branch 'origin/master' 2023-12-07 14:02:10 +08:00
齐天大圣
90b80a1290 修改可用优惠券 2023-12-07 14:01:59 +08:00
wangh
b40a9d8efe Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
 2023-12-07 10:24:29 +08:00
wangh
08242aff89 no message 2023-12-07 10:23:33 +08:00
wangh
b93f9559de no message 2023-12-07 10:23:14 +08:00
wangh
f50982f0e6 充值订单 2023-12-07 10:22:52 +08:00
cun-nan
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
齐天大圣
19fc2fdb2b Merge remote-tracking branch 'origin/master' 2023-12-06 18:01:06 +08:00
齐天大圣
fbbe572286 优化活动 2023-12-06 18:00:48 +08:00
cun-nan
426cd1ca30 订单信息 2023-12-05 17:18:27 +08:00
wangh
6dd43b9d68 积分详情 2023-12-05 15:16:15 +08:00
wangh
abe9969d75 修改 2023-12-05 13:44:15 +08:00
cun-nan
6e8508cd5b 会员信息 2023-12-05 12:04:03 +08:00
@QQNZX
1042b55806 12.05前端 2023-12-05 11:16:58 +08:00
齐天大圣
880bb21ae5 Merge remote-tracking branch 'origin/master' 2023-12-05 09:43:47 +08:00
齐天大圣
03a83c5702 油站活动 2023-12-05 09:43:37 +08:00
wangh
4eaafc9bf0 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-05 09:24:35 +08:00
wangh
869f189c4d no message 2023-12-05 09:24:31 +08:00
cun-nan
0416cb19d0 会员信息 2023-12-04 16:35:09 +08:00
齐天大圣
cf5d5684e0 Merge remote-tracking branch 'origin/master' 2023-12-01 16:48:06 +08:00
齐天大圣
eca6f8a9a7 小程序储值卡 2023-12-01 16:47:56 +08:00
wangh
a913c83238 no message 2023-12-01 16:40:20 +08:00
cun-nan
ef2ef63234 会员信息 2023-12-01 16:26:25 +08:00
wangh
81749b3388 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-01 15:42:28 +08:00
wangh
78c6d5d5d9 no message 2023-12-01 15:42:23 +08:00
cun-nan
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
cun-nan
d48a4cabe7 会员信息 2023-11-30 18:30:46 +08:00
齐天大圣
f3461e779b Merge remote-tracking branch 'origin/master' 2023-11-30 17:29:19 +08:00
齐天大圣
cb2543531d 小程序端活动02 2023-11-30 17:29:10 +08:00
wangh
ca0c13a07c Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-30 14:28:18 +08:00
wangh
eff9fccd2f 封面会员价 2023-11-30 14:28:12 +08:00
cun-nan
41cabe23d1 Merge remote-tracking branch 'origin/master' 2023-11-30 11:57:53 +08:00
cun-nan
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00
wangh
ed40ec677e no message 2023-11-30 11:37:32 +08:00
wangh
d0348342f5 no message 2023-11-30 11:25:19 +08:00
wangh
9ff4038838 登录接口 2023-11-30 11:07:26 +08:00
wangh
cb14e279c2 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-30 09:06:13 +08:00
wangh
2fbeeabba2 no message 2023-11-30 09:06:08 +08:00
cun-nan
f920b643aa 会员信息 2023-11-29 18:33:09 +08:00
齐天大圣
a77183d47b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
 2023-11-29 18:23:52 +08:00
齐天大圣
eff58c7a3a 小程序端活动 2023-11-29 18:21:11 +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
wangh
dd5df3bc78 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-29 17:19:38 +08:00
wangh
f6413514f6 1 2023-11-29 17:19:32 +08:00
cun-nan
71b21efc27 会员信息 2023-11-29 17:18:28 +08:00
cun-nan
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
cun-nan
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
cun-nan
cec9d85b3a 收银台 2023-11-28 18:33:35 +08:00
wangh
195a7298e0 1 2023-11-28 18:10:16 +08:00
cun-nan
37fa476a0f 收银台 2023-11-28 16:40:05 +08:00
cun-nan
996d2ea94c 收银台 2023-11-28 15:42:35 +08:00
cun-nan
f30a3556e3 收银台 2023-11-27 18:28:41 +08:00
wangh
b00edb2f12 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-25 18:08:58 +08:00
cun-nan
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
wangh
90a3adc44f bug 
修改
 2023-11-25 18:08:15 +08:00
齐天大圣
ad81a123c6 Merge remote-tracking branch 'origin/master' 2023-11-25 14:42:05 +08:00
齐天大圣
492179cb24 修改Bug 2023-11-25 14:41:54 +08:00
cun-nan
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
cun-nan
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
wangh
f706797001 bug修改 2023-11-24 17:59:53 +08:00
齐天大圣
87147fbcf3 Merge remote-tracking branch 'origin/master' 2023-11-24 17:24:20 +08:00
齐天大圣
92d425f57c 手机验证码登录 2023-11-24 17:24:10 +08:00
wangh
7e8e0fac03 修改 2023-11-24 10:23:59 +08:00
cun-nan
302a7850fe 收银台 2023-11-23 18:37:40 +08:00
wangh
d68f87b29b bug修改 2023-11-23 18:33:25 +08:00
cun-nan
58db28edfb 收银台 2023-11-22 18:10:36 +08:00
wangh
b2574cc2cb 会员等级和进油修改 2023-11-22 18:05:02 +08:00
齐天大圣
f6a9d94364 Merge remote-tracking branch 'origin/master' 2023-11-22 13:40:06 +08:00
齐天大圣
9da6684bf0 修改Bug 2023-11-22 13:39:57 +08:00
wangh
19f521c406 修改bug 2023-11-22 10:53:41 +08:00
齐天大圣
efaf87cb3e Merge remote-tracking branch 'origin/master' 2023-11-22 10:47:32 +08:00
齐天大圣
916383fe82 修改Bug 2023-11-22 10:47:20 +08:00
wangh
b51938071a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-21 18:12:04 +08:00
wangh
174bfee9d5 bug修改 2023-11-21 18:11:49 +08:00
齐天大圣
92251e2556 Merge remote-tracking branch 'origin/master' 2023-11-21 14:30:06 +08:00
齐天大圣
3eec70da9b 修改Bug 2023-11-21 14:29:55 +08:00
cun-nan
92f6691025 收银台 2023-11-21 11:00:14 +08:00
齐天大圣
3c916cb22b Merge remote-tracking branch 'origin/master' 2023-11-21 09:45:37 +08:00
齐天大圣
4293d06417 兑换优惠券 2023-11-21 09:45:28 +08:00
cun-nan
7ec55c0386 收银台 2023-11-20 19:53:05 +08:00
cun-nan
5568c13c04 收银台 2023-11-20 14:27:22 +08:00
齐天大圣
40afd862da Merge remote-tracking branch 'origin/master' 2023-11-20 09:22:30 +08:00
齐天大圣
61fd49e3c4 满减优惠券 2023-11-20 09:22:14 +08:00
wangh
516f80e57b 收银台 2023-11-17 16:38:17 +08:00
cun-nan
b9b49fcb62 收银台 2023-11-17 16:33:36 +08:00
齐天大圣
435e6feb10 会员等级 2023-11-17 15:39:55 +08:00
齐天大圣
88053d1a20 修改会员等级 2023-11-17 15:21:40 +08:00
齐天大圣
40c0b630e2 Merge remote-tracking branch 'origin/master' 2023-11-17 13:09:40 +08:00
齐天大圣
9fee58ebd7 修改卡券Bug 2023-11-17 13:09:28 +08:00
wangh
478e6fc8f8 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-17 11:14:45 +08:00
wangh
de70f12c56 油枪 2023-11-17 11:14:36 +08:00
cun-nan
6f1406f8c6 收银台 2023-11-16 19:00:57 +08:00
wangh
4ef7e1cdca Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/.env.development
 2023-11-16 18:42:37 +08:00
wangh
b1329a0dcc 积分兑换 2023-11-16 18:40:50 +08:00
齐天大圣
b9f4fad30f 卡券核销 2023-11-16 18:31:29 +08:00
齐天大圣
758442ff37 Merge remote-tracking branch 'origin/master' 2023-11-15 19:36:20 +08:00
齐天大圣
8581ade77e 新人有礼 2023-11-15 19:36:12 +08:00
cun-nan
5bafce40c5 收银台 2023-11-15 18:48:07 +08:00
齐天大圣
1c320b17c1 折扣营销 2023-11-15 18:26:05 +08:00
齐天大圣
88e9ba8bc9 Merge remote-tracking branch 'origin/master' 2023-11-15 14:34:45 +08:00
齐天大圣
925c8cc402 修改消费有礼bug 2023-11-15 14:34:34 +08:00
cun-nan
757d9c5adb 收银台 2023-11-14 19:00:25 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
齐天大圣
684598000e Merge remote-tracking branch 'origin/master' 2023-11-14 11:20:29 +08:00
齐天大圣
9d79c997a6 营销活动 2023-11-14 11:20:08 +08:00
cun-nan
4f69e72145 Merge remote-tracking branch 'origin/master' 2023-11-13 19:01:25 +08:00
cun-nan
f72db0c784 收银台 2023-11-13 18:59:13 +08:00
wangh
f2a65be97f 存油 2023-11-13 18:58:31 +08:00
wangh
22aee4bb01 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-13 16:54:24 +08:00
wangh
70e1dc3d3d 余额充值 2023-11-13 16:53:12 +08:00
cun-nan
c06e8b1c59 收银台 2023-11-13 16:51:57 +08:00
cun-nan
c31617ed7f 收银台 2023-11-13 16:51:38 +08:00
cun-nan
79134699fd 收银台 2023-11-11 18:04:49 +08:00
wangh
5d67b7cbb3 充值 2023-11-11 18:02:25 +08:00
cun-nan
c9c66c61dd 收银台 2023-11-11 13:54:24 +08:00
wangh
b1b4e1c94d 积分 2023-11-10 18:19:33 +08:00
cun-nan
42b625266d 收银台 2023-11-10 18:10:23 +08:00
cun-nan
62f5e61959 收银台 2023-11-10 14:59:23 +08:00
cun-nan
79cded741a 收银台 2023-11-09 18:52:12 +08:00
DESKTOP-369JRHT\12997
46e0745947 积分设置 2023-11-09 18:31:36 +08:00
齐天大圣
d1e5ca4140 修改优惠券id 2023-11-09 13:53:03 +08:00
cun-nan
a3f8c672f1 收银台 2023-11-09 13:51:57 +08:00