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

542 Commits

Author SHA1 Message Date
cun-nan
8a943fdb10 bug 2024-01-31 17:05:12 +08:00
cun-nan
788fba4dae bug 2024-01-30 19:40:58 +08:00
cun-nan
63ca5ca01b bug 2024-01-30 18:36:40 +08:00
齐天大圣
d5a7ddd1d2 Merge remote-tracking branch 'origin/master' 2024-01-30 18:13:02 +08:00
齐天大圣
1d6f84a76a 一键发券 2024-01-30 18:12:51 +08:00
cun-nan
79c152ca76 bug 2024-01-30 16:04:49 +08:00
wangh
8b907e9ad0 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
#	fuintAdmin_zt/.env.development
 2024-01-30 09:57:21 +08:00
wangh
a882859c82 no message 2024-01-30 09:56:24 +08:00
cun-nan
cedf3c7281 bug 2024-01-29 18:18:30 +08:00
@QQNZX
b5c6f8382f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/pages/index/index.vue
 2024-01-29 14:50:40 +08:00
@QQNZX
83629529d5 前端 2024-01-29 14:50:20 +08:00
cun-nan
d7d8256135 bug 2024-01-29 14:26:14 +08:00
wangh
58e5f81d8b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-29 14:23:44 +08:00
wangh
a2028102d4 支付宝兼容 2024-01-29 14:23:39 +08:00
齐天大圣
acf41325ef 一键发券 2024-01-29 14:11:02 +08:00
cun-nan
60ccc78c46 bug 2024-01-29 09:50:28 +08:00
cun-nan
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
cun-nan
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
cun-nan
32cb50848f bug 2024-01-27 10:51:32 +08:00
cun-nan
249b30da4d bug 2024-01-27 09:05:50 +08:00
cun-nan
c1bb1af124 bug 2024-01-26 13:33:09 +08:00
cun-nan
d54ef244a8 bug 2024-01-25 18:27:19 +08:00
wangh
3d3ea7ba06 no message 2024-01-25 16:48:08 +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
cun-nan
6976d3e7ce bug 2024-01-25 10:13:43 +08:00
cun-nan
18ce89b555 bug 2024-01-25 09:18:06 +08:00
cun-nan
cd43e4f48a bug 2024-01-24 18:11:58 +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
齐天大圣
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
cun-nan
819624e4e8 bug 2024-01-24 14:35:00 +08:00
cun-nan
cf631ad033 bug 2024-01-23 18:14:56 +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
cun-nan
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
齐天大圣
6c1257e605 111 2024-01-19 18:18:27 +08:00
cun-nan
5c4922d656 bug 2024-01-19 14:54:59 +08:00
齐天大圣
f467023ba0 bug 2024-01-19 14:28:32 +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
cun-nan
944b5bbb87 bug 2024-01-18 15:01:26 +08:00
cun-nan
d8023ecfba bug 2024-01-18 10:56:43 +08:00
wangh
46913be03f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
 2024-01-18 09:03:42 +08:00
wangh
5c65399290 退款以及订单统计 2024-01-18 09:01:26 +08:00
cun-nan
45677555fc bug 2024-01-17 16:26:08 +08:00
cun-nan
e9dd0600c2 bug 2024-01-17 14:14:19 +08:00
cun-nan
2398ead499 bug 2024-01-16 11:30:23 +08:00
cun-nan
298977bb25 bug 2024-01-15 18:17:40 +08:00
wangh
a3c31a8d59 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-01-15 13:43:41 +08:00
wangh
a92a25fb28 bug 2024-01-15 13:41:32 +08:00
@QQNZX
0ec2ff3c91 前端 2024-01-15 13:36:34 +08:00
@QQNZX
89d2d71152 前端 2024-01-15 11:39:48 +08:00
cun-nan
ea8bab751a bug 2024-01-13 18:01:23 +08:00
wangh
bff603b970 no message 2024-01-13 15:04:45 +08:00
齐天大圣
18d96bb254 Merge remote-tracking branch 'origin/master' 2024-01-13 13:50:29 +08:00
齐天大圣
7d9d150c38 修改bug 2024-01-13 13:50:18 +08:00
wangh
0ed07ccd49 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 13:24:02 +08:00
齐天大圣
77df396e46 Merge remote-tracking branch 'origin/master' 2024-01-13 13:22:42 +08:00
齐天大圣
0163084c13 修改bug 2024-01-13 13:22:33 +08:00
wangh
5d9de0a0dc bug修改 2024-01-13 13:22:10 +08:00
cun-nan
399cf05de6 bug 2024-01-13 13:13:18 +08:00
cun-nan
7a5a1dcddb Merge remote-tracking branch 'origin/master' 2024-01-13 10:35:18 +08:00
cun-nan
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
齐天大圣
3ee4bd0073 Merge remote-tracking branch 'origin/master' 2024-01-13 09:49:54 +08:00
齐天大圣
7de4b95679 修改bug 2024-01-13 09:49:42 +08:00
cun-nan
686a0d2e03 bug 2024-01-12 18:03:02 +08:00
齐天大圣
f57f77d8ed 修改bug 2024-01-12 14:41:47 +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
cun-nan
4ed6ba6e8c bug 2024-01-12 13:55:40 +08:00
齐天大圣
8537041269 Merge remote-tracking branch 'origin/master' 2024-01-12 12:05:55 +08:00
齐天大圣
b5d5f6b1eb 修改bug 2024-01-12 12:05:42 +08:00
cun-nan
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
cun-nan
2a81b49f14 bug 2024-01-11 09:51:50 +08:00
cun-nan
a61a99cde7 优化项 2024-01-10 18:09:46 +08:00
wangh
301be80121 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-10 15:44:04 +08:00
wangh
48ce157316 bug 2024-01-10 15:43:57 +08:00
齐天大圣
075427613d 修改bug 2024-01-10 15:30:04 +08:00
齐天大圣
62635c72c2 修改bug 2024-01-10 14:34:55 +08:00
齐天大圣
c54a35084f Merge remote-tracking branch 'origin/master' 2024-01-10 13:54:55 +08:00
齐天大圣
ce2f96006b 修改bug 2024-01-10 13:54:45 +08:00
cun-nan
eaa527e109 优化项 2024-01-10 13:45:02 +08:00
cun-nan
8e2fc95aa9 Merge remote-tracking branch 'origin/master' 2024-01-10 11:06:57 +08:00
cun-nan
c076b07a83 优化项 2024-01-10 11:06:41 +08:00
wangh
3054607717 bug修改 2024-01-09 17:09:45 +08:00
wangh
bbded088aa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
 2024-01-09 13:19:59 +08:00
wangh
3f857268a6 bug修改 2024-01-09 12:02:40 +08:00
cun-nan
431947960b 优化项 2024-01-08 14:45:36 +08:00
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
6813f67d38 优化项 2024-01-06 18:04:36 +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
6119bba60b no message 2024-01-06 15:07:18 +08:00
cun-nan
683b41e456 优化项 2024-01-06 13:37:21 +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
@QQNZX
9acd5324d5 前端 2024-01-05 14:02:20 +08:00
cun-nan
cff6a8942b 优化项 2024-01-04 18:44:52 +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
@QQNZX
d22f21bf03 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/config.js
 2024-01-04 09:11:09 +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
@QQNZX
0ecf231fd5 Merge remote-tracking branch 'origin/master' 2024-01-04 09:06:45 +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
@QQNZX
03b512ef75 前端 模板的更新 2024-01-03 14:24:24 +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
@QQNZX
f161d1368a 前端 2024-01-02 15:56:33 +08:00
wangh
eac375458b bug修改 2024-01-02 14:24:47 +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
齐天大圣
53a7cce4dc Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
 2023-12-29 13:40:44 +08:00
齐天大圣
239aa0aeab 静态图片 2023-12-27 16:08:50 +08:00
cun-nan
53288a6e77 意见反馈 2023-12-26 18:44:50 +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
52379f54d0 加油信息 2023-12-19 18:03:05 +08:00
cun-nan
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
wangh
b4cdb77bdf no message 2023-12-18 17:44:23 +08:00
wangh
026b7e6d0b 主页的数据统计 2023-12-18 17:42:52 +08:00
@QQNZX
bfd2ed0eeb 油站pc 2023-12-14 15:26:00 +08:00
wangh
f0f50652e3 pc端 增加个人统计 和数据统计 2023-12-14 13:39:27 +08:00
wangh
1956d1a25b 自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端） 2023-12-14 13:36:36 +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
齐天大圣
ce0c69be7a bug 12.08 2023-12-08 13:33:52 +08:00
wangh
f50982f0e6 充值订单 2023-12-07 10:22:52 +08:00
@QQNZX
3e22074fa1 12.05前端 2023-12-05 11:41:42 +08:00
@QQNZX
1042b55806 12.05前端 2023-12-05 11:16:58 +08:00
wangh
869f189c4d no message 2023-12-05 09:24:31 +08:00
齐天大圣
cadeccf2f8 储值卡 2023-12-01 16:49:10 +08:00
cun-nan
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
cun-nan
d48a4cabe7 会员信息 2023-11-30 18:30:46 +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
齐天大圣
eecf1a94bd 提交忽略文件 2023-11-30 10:56:05 +08:00
cun-nan
f920b643aa 会员信息 2023-11-29 18:33:09 +08:00
cun-nan
71b21efc27 会员信息 2023-11-29 17:18:28 +08:00
@QQNZX
56449e11de Merge remote-tracking branch 'origin/master' 2023-11-29 16:53:14 +08:00
@QQNZX
c9f277771f 11.29前端 2023-11-29 16:52:59 +08:00
cun-nan
491c8bf426 会员信息 2023-11-29 16:26:19 +08:00
cun-nan
cec9d85b3a 收银台 2023-11-28 18:33: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
wangh
7ea34fc665 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-25 18:08:29 +08:00
cun-nan
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
wangh
90a3adc44f bug 
修改
 2023-11-25 18:08:15 +08:00
@QQNZX
ac1c6325de 11.25前端 2023-11-25 18:07:50 +08:00
@QQNZX
e7ebac6b34 Merge remote-tracking branch 'origin/master' 2023-11-25 15:31:18 +08:00
@QQNZX
2dee747f0c 11.22前端 2023-11-25 15:31:09 +08:00
cun-nan
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
@QQNZX
41198cef57 11.22前端 2023-11-25 09:30:24 +08:00
@QQNZX
1088d21953 Merge remote-tracking branch 'origin/master' 2023-11-25 09:04:31 +08:00
@QQNZX
d5b4b7d316 11.22前端 2023-11-25 09:04:19 +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
wangh
d68f87b29b bug修改 2023-11-23 18:33:25 +08:00
cun-nan
5963655f43 收银台 2023-11-23 16:28:06 +08:00
wangh
b2574cc2cb 会员等级和进油修改 2023-11-22 18:05:02 +08:00
@QQNZX
64ee2829d3 Merge remote-tracking branch 'origin/master' 2023-11-22 17:05:16 +08:00
@QQNZX
d2ae2e29c5 11.22前端 2023-11-22 17:05:07 +08:00
wangh
19f521c406 修改bug 2023-11-22 10:53:41 +08:00
@QQNZX
729c9ec320 Merge remote-tracking branch 'origin/master' 2023-11-22 09:06:41 +08:00
@QQNZX
9031fbbe18 11.22前端 2023-11-22 09:06:13 +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
@QQNZX
3cc308ba41 11.21前端 2023-11-21 18:05:11 +08:00
@QQNZX
5988a46511 11.21前端 2023-11-21 16:44:51 +08:00
@QQNZX
c068cdefa0 11.21前端 2023-11-21 15:57:47 +08:00
@QQNZX
2d2668b761 11.21前端 2023-11-21 13:40:12 +08:00
@QQNZX
9e267202b7 11.21前端 2023-11-21 09:50:47 +08:00
@QQNZX
17a7860505 11.21前端 2023-11-21 09:09:52 +08:00
@QQNZX
0524b13b3c 11.20前端 2023-11-20 17:52:14 +08:00
@QQNZX
53524364dc 11.20前端 2023-11-20 11:23:38 +08:00
@QQNZX
a62eb32734 11.20 2023-11-20 09:28:45 +08:00
@QQNZX
a80c862306 11.16 2023-11-17 15:45:07 +08:00
@QQNZX
e9db6fd020 11.16 2023-11-17 15:38:56 +08:00
@QQNZX
0935f6b5f4 11.16 2023-11-17 15:12:06 +08:00
齐天大圣
d184f6cccd 会员等级 2023-11-17 14:55:45 +08:00
@QQNZX
0747a79c6f 11.16 2023-11-17 13:09:47 +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
@QQNZX
859a05407f Merge remote-tracking branch 'origin/master' 2023-11-16 18:39:16 +08:00
@QQNZX
bbc0a08162 11.16 2023-11-16 18:39:06 +08:00
齐天大圣
0143eed720 Merge remote-tracking branch 'origin/master' 2023-11-16 18:31:37 +08:00
齐天大圣
b9f4fad30f 卡券核销 2023-11-16 18:31:29 +08:00
@QQNZX
dde0c7d4ee 11.16 2023-11-16 17:50:02 +08:00
@QQNZX
f0342e4544 11.16 2023-11-16 10:55:35 +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
@QQNZX
b3e199acb6 11.15 2023-11-15 18:42:06 +08:00
齐天大圣
1c320b17c1 折扣营销 2023-11-15 18:26:05 +08:00
@QQNZX
6a8849aea4 11.15 2023-11-15 14:33:51 +08:00
@QQNZX
793e5c9e39 11.15 2023-11-15 09:09:34 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
@QQNZX
7ab789ba2a 11.11 2023-11-14 16:08:33 +08:00
齐天大圣
6400889d3c 营销活动 2023-11-14 11:27:58 +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
b080f3e344 前端支付 2023-11-13 16:54:15 +08:00
cun-nan
c06e8b1c59 收银台 2023-11-13 16:51:57 +08:00
@QQNZX
4feda12365 11.11 2023-11-13 10:04:51 +08:00
cun-nan
79134699fd 收银台 2023-11-11 18:04:49 +08:00
wangh
5d67b7cbb3 充值 2023-11-11 18:02:25 +08:00
@QQNZX
492e53ca49 Merge remote-tracking branch 'origin/master' 2023-11-11 17:54:12 +08:00
@QQNZX
bd14aef39b 11.11 2023-11-11 17:54:03 +08:00
wangh
3227f9b44b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-11 13:28:09 +08:00
@QQNZX
aab74f80c3 11.11 2023-11-11 10:57:49 +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
DESKTOP-369JRHT\12997
46e0745947 积分设置 2023-11-09 18:31:36 +08:00
齐天大圣
04e5fc97be 修改优惠券在线下线默认值 2023-11-09 13:53:02 +08:00
DESKTOP-369JRHT\12997
9e2b9068a2 积分 2023-11-08 18:08:54 +08:00
cun-nan
3c1a0c7ca9 收银台 2023-11-08 18:07:17 +08:00
user
55d4e8631d 11.6 2023-11-08 17:01:44 +08:00
user
94f072b247 11.6 2023-11-08 16:38:22 +08:00
user
c1b7ef61b5 11.6 2023-11-08 14:58:40 +08:00
齐天大圣
4d28a69c94 Merge remote-tracking branch 'origin/master' 2023-11-08 09:33:29 +08:00
齐天大圣
94adf07fa8 优惠券 2023-11-08 09:33:11 +08:00