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

289 Commits

Author SHA1 Message Date
cun-nan
ef6ee5aef0 bug 2024-02-06 13:38:17 +08:00
cun-nan
bfef076269 bug 2024-02-06 11:38:42 +08:00
cun-nan
7c538e5aab bug 2024-02-05 18:09:05 +08:00
wangh
614387248f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-05 17:35:47 +08:00
wangh
a32a779fe0 no message 2024-02-05 17:35:38 +08:00
cun-nan
9f5d333798 bug 2024-02-04 18:08:43 +08:00
cun-nan
033a66f12d bug 2024-02-04 13:37:04 +08:00
cun-nan
e38c87edaf bug 2024-02-03 13:47:34 +08:00
cun-nan
206f171544 bug 2024-02-02 18:02:17 +08:00
cun-nan
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
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
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
189f6dff68 no message 2024-01-30 09:56:03 +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
a2028102d4 支付宝兼容 2024-01-29 14:23:39 +08:00
cun-nan
0e40832516 bug 2024-01-27 17:58:07 +08:00
cun-nan
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
cun-nan
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
cun-nan
c1bb1af124 bug 2024-01-26 13:33:09 +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
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
cun-nan
803e28bdcd bug 2024-01-24 17:10:37 +08:00
wangh
149d4120ae no message 2024-01-24 15:22:32 +08:00
cun-nan
5470356f7e bug 2024-01-24 15:14:48 +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
15ca62967e bug 2024-01-23 16:02:28 +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
cun-nan
fc1ccdd60e bug 2024-01-22 14:28:30 +08:00
cun-nan
179f49c58f bug 2024-01-22 11:51:12 +08:00
N
c1e0c75bca bug 2024-01-20 23:17:50 +08:00
cun-nan
af1a1a25f0 bug 2024-01-20 18:11:29 +08:00
cun-nan
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
齐天大圣
f467023ba0 bug 2024-01-19 14:28:32 +08:00
wangh
66910b4bf4 bug处理 2024-01-18 18:06:07 +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
0111c8055c bug 2024-01-17 17:36:21 +08:00
cun-nan
e9dd0600c2 bug 2024-01-17 14:14:19 +08:00
wangh
82a739ce75 退款处理 2024-01-16 16:10:28 +08:00
cun-nan
4cddc769d1 bug 2024-01-16 14:42:20 +08:00
cun-nan
41bf52b5bf bug 2024-01-16 14:19:08 +08:00
cun-nan
2398ead499 bug 2024-01-16 11:30:23 +08:00
wangh
6e16f6ac5d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-16 09:38:22 +08:00
wangh
7768b2faf3 退款接口 2024-01-16 09:38:15 +08:00
cun-nan
298977bb25 bug 2024-01-15 18:17:40 +08:00
cun-nan
8ca3554f0c bug 2024-01-15 16:10:11 +08:00
cun-nan
3f243f5c63 bug 2024-01-15 14:00:24 +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
cun-nan
536428b2c2 bug 2024-01-13 15:16:57 +08:00
cun-nan
87f9377e74 bug 2024-01-13 14:21:09 +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
94b0dacae7 bug 2024-01-13 11:53:00 +08:00
cun-nan
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
wangh
873825c669 no message 2024-01-12 17:08:26 +08:00
cun-nan
db6d7f9c85 bug 2024-01-12 17:03:22 +08:00
cun-nan
66585d6d2c bug 2024-01-12 15:41:37 +08:00
cun-nan
288de2b8ba bug 2024-01-12 15:29:24 +08:00
@QQNZX
0d653b93e3 前端 2024-01-12 14:47:14 +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
cun-nan
654d912ef1 bug 2024-01-12 13:26:22 +08:00
cun-nan
7c512e33aa bug 2024-01-11 18:08:12 +08:00
cun-nan
2a9b7cae2e bug 2024-01-11 13:55:20 +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
c3e633ca43 优化项 2024-01-08 18:26:49 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +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
cun-nan
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
cun-nan
eae119f033 优化项 2024-01-05 18:27:59 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +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
cun-nan
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +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
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
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
cun-nan
9edf62a5a2 二维码 2023-12-25 18:10:00 +08:00
cun-nan
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
cun-nan
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
cun-nan
217c669407 订单信息 2023-12-13 18:43:50 +08:00
cun-nan
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
cun-nan
31c8f79bc9 订单信息 2023-12-06 18:36:10 +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
cun-nan
0416cb19d0 会员信息 2023-12-04 16:35:09 +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
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +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
cun-nan
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
wangh
90a3adc44f bug 
修改
 2023-11-25 18:08:15 +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
cun-nan
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
wangh
f706797001 bug修改 2023-11-24 17:59:53 +08:00
wangh
7e8e0fac03 修改 2023-11-24 10:23:59 +08:00
wangh
0aac738281 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-24 09:18:46 +08:00
wangh
7ad76afaca 修改 2023-11-24 09:18:11 +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
@QQNZX
d2ae2e29c5 11.22前端 2023-11-22 17:05:07 +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
cun-nan
f0a970479f 收银台 2023-11-21 18:18:35 +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