Commit Graph

298 Commits

Author SHA1 Message Date
ff0af40e39 bug 2024-05-10 17:36:24 +08:00
wangh
02c9f2c113 打印机对接 2024-05-08 09:03:51 +08:00
29e9b31c71 bug 2024-04-29 16:12:49 +08:00
79522d9e90 bug 2024-04-10 16:38:30 +08:00
f76dc40dea bug 2024-04-10 14:36:15 +08:00
cfe09ba8b0 bug 2024-04-09 09:28:04 +08:00
e2c8850da2 bug 2024-03-16 13:40:36 +08:00
f912295e37 bug 2024-03-15 16:28:26 +08:00
c9d31d47d3 bug 2024-03-15 16:12:04 +08:00
39b84372d9 bug 2024-03-15 14:57:29 +08:00
349668eaaa bug 2024-03-15 14:39:47 +08:00
bebc6798da bug 2024-03-15 13:45:56 +08:00
b3dd88bc7b bug 2024-03-15 09:52:11 +08:00
d85a897b5c bug 2024-03-15 09:30:28 +08:00
98406ae1b4 bug 2024-03-15 09:01:19 +08:00
@QQNZX
82f1d4a1c5 前端 2024-03-14 20:45:09 +08:00
b1d49e4ece bug 2024-03-14 15:39:19 +08:00
e1bc8c7072 bug 2024-03-12 09:59:08 +08:00
094804d122 bug 2024-03-11 18:05:45 +08:00
a3d3909045 bug 2024-03-07 16:33:19 +08:00
825bc8bec6 bug 2024-03-05 16:20:24 +08:00
83b16a32e3 bug 2024-03-05 15:44:43 +08:00
4b1ee8a19f bug 2024-03-05 14:16:43 +08:00
c09a30d546 bug 2024-03-05 09:54:51 +08:00
6e2e6830ed bug 2024-03-04 14:25:20 +08:00
2552723bfd bug 2024-03-02 17:58:59 +08:00
9d869e404f bug 2024-03-02 16:41:18 +08:00
24818cb60e bug 2024-03-01 17:55:13 +08:00
55e449a45d bug 2024-03-01 15:38:46 +08:00
c71ddb7e82 bug 2024-02-29 18:06:34 +08:00
wangh
46282a3edb Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-29 17:02:13 +08:00
wangh
5d22a35b1b no message 2024-02-29 17:02:07 +08:00
c79e5b3e9a bug 2024-02-28 18:02:53 +08:00
wangh
2a6abf3b57 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-28 13:25:00 +08:00
wangh
d570586be5 no message 2024-02-28 13:24:53 +08:00
101ef539c3 bug 2024-02-27 17:59:16 +08:00
wangh
570f8c9c0f no message 2024-02-27 15:32:58 +08:00
wangh
00386746aa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-27 14:03:52 +08:00
wangh
50cd7a5a34 no message 2024-02-27 14:03:47 +08:00
e47d92d168 bug 2024-02-26 19:27:54 +08:00
wangh
a11a04be18 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
2024-02-26 15:09:55 +08:00
wangh
71ad3c3085 bug处理 2024-02-26 15:08:32 +08:00
a69b4d806e bug 2024-02-26 15:05:21 +08:00
4af99bb62e bug 2024-02-23 18:00:16 +08:00
08d2140ca7 bug 2024-02-22 17:53:41 +08:00
702dceb375 bug 2024-02-21 17:02:13 +08:00
bf998c65b6 bug 2024-02-20 17:52:09 +08:00
wangh
e804dff7d5 退款 2024-02-20 10:58:23 +08:00
wangh
a0629a80fa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-19 16:38:08 +08:00
wangh
6f6988b8b2 no message 2024-02-19 16:38:03 +08:00
b137edcac0 bug 2024-02-19 16:03:34 +08:00
9b11659153 bug 2024-02-18 18:09:52 +08:00
wangh
e5a24d3c83 no message 2024-02-07 17:29:50 +08:00
wangh
ad7f7356c7 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-07 11:07:07 +08:00
wangh
dd08ddd5f1 no message 2024-02-07 11:07:03 +08:00
3c6defd2c6 bug 2024-02-06 16:48:14 +08:00
fd0091634f bug 2024-02-06 16:35:34 +08:00
wangh
bca15b8ae5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-06 15:48:31 +08:00
wangh
7e48ac59dd no message 2024-02-06 15:48:25 +08:00
ef6ee5aef0 bug 2024-02-06 13:38:17 +08:00
bfef076269 bug 2024-02-06 11:38:42 +08:00
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
9f5d333798 bug 2024-02-04 18:08:43 +08:00
033a66f12d bug 2024-02-04 13:37:04 +08:00
e38c87edaf bug 2024-02-03 13:47:34 +08:00
206f171544 bug 2024-02-02 18:02:17 +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
8a943fdb10 bug 2024-01-31 17:05:12 +08:00
788fba4dae bug 2024-01-30 19:40:58 +08:00
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
d7d8256135 bug 2024-01-29 14:26:14 +08:00
wangh
a2028102d4 支付宝兼容 2024-01-29 14:23:39 +08:00
0e40832516 bug 2024-01-27 17:58:07 +08:00
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
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
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
18ce89b555 bug 2024-01-25 09:18:06 +08:00
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
803e28bdcd bug 2024-01-24 17:10:37 +08:00
wangh
149d4120ae no message 2024-01-24 15:22:32 +08:00
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
819624e4e8 bug 2024-01-24 14:35:00 +08:00
15ca62967e bug 2024-01-23 16:02:28 +08:00