dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,813 Commits 2 Branches 0 Tags 191 MiB
8e5e3827c9
Commit Graph

689 Commits

Author SHA1 Message Date
xvv
ce5473ac3b 前端 2024-07-11 10:30:50 +08:00
xvv
36cb0cbc6c Merge remote-tracking branch 'origin/master' 2024-07-11 10:10:47 +08:00
xvv
67fa5f4cf6 前端 2024-07-11 10:10:35 +08:00
DESKTOP-369JRHT\12997
ff361e68fa Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-11 10:01:03 +08:00
DESKTOP-369JRHT\12997
cd4d74e2ac no message 2024-07-11 10:00:57 +08:00
xvv
24858abfd9 前端 2024-07-10 15:53:54 +08:00
DESKTOP-369JRHT\12997
e22a23f05f no message 2024-07-10 14:58:33 +08:00
DESKTOP-369JRHT\12997
b13c529045 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintAdmin_zt/src/views/Site/index.vue
#	fuintAdmin_zt/src/views/login.vue
 2024-07-09 16:44:03 +08:00
DESKTOP-369JRHT\12997
457953c715 页面跳转，组织架构 2024-07-09 16:36:43 +08:00
xvv
071e889135 前端 2024-07-09 15:25:28 +08:00
cun-nan
53fa99e0b2 bug 2024-07-09 15:20:26 +08:00
cun-nan
b3a1c3df30 bug 2024-07-09 14:24:12 +08:00
xvv
4273fd0d41 前端 2024-07-09 09:24:21 +08:00
cun-nan
15c4c2ed3d bug 2024-07-08 17:52:02 +08:00
DESKTOP-369JRHT\12997
4f7abd2c45 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-06 18:00:48 +08:00
DESKTOP-369JRHT\12997
1260bc9888 no message 2024-07-06 18:00:45 +08:00
cun-nan
958a904cec bug 2024-07-06 16:52:28 +08:00
DESKTOP-369JRHT\12997
34e4e66d46 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-06 15:32:29 +08:00
DESKTOP-369JRHT\12997
24504eacd7 no message 2024-07-06 15:32:25 +08:00
cun-nan
b228266842 bug 2024-07-06 15:31:32 +08:00
cun-nan
f075b31b3a bug 2024-07-06 15:02:10 +08:00
DESKTOP-369JRHT\12997
aaa5ca3c24 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-06 14:43:58 +08:00
DESKTOP-369JRHT\12997
1f6b91bc9b no message 2024-07-06 14:43:55 +08:00
cun-nan
231f6b9031 bug 2024-07-06 10:43:36 +08:00
xvv
e13bc1e727 前端 2024-07-06 10:30:49 +08:00
xvv
3fcb1adda3 前端 2024-07-06 10:17:24 +08:00
cun-nan
c6830ae865 bug 2024-07-06 09:47:26 +08:00
DESKTOP-369JRHT\12997
ee9156fe62 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-06 09:00:47 +08:00
DESKTOP-369JRHT\12997
c69442eaa8 no message 2024-07-06 09:00:43 +08:00
cun-nan
98aa63d25a bug 2024-07-05 16:35:53 +08:00
cun-nan
928aaab0b1 bug 2024-07-05 16:34:37 +08:00
DESKTOP-369JRHT\12997
6d62e856b5 no message 2024-07-05 15:54:52 +08:00
DESKTOP-369JRHT\12997
fb1f3d424a Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-05 15:48:12 +08:00
DESKTOP-369JRHT\12997
14e7685ae1 no message 2024-07-05 15:48:10 +08:00
cun-nan
014ff335a4 bug 2024-07-05 15:42:05 +08:00
DESKTOP-369JRHT\12997
b5c347b441 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-05 14:12:36 +08:00
DESKTOP-369JRHT\12997
f66644e922 no message 2024-07-05 14:12:31 +08:00
xvv
282f0470dc 前端 2024-07-05 14:11:26 +08:00
xvv
0010de1ad4 前端 2024-07-04 16:35:09 +08:00
DESKTOP-369JRHT\12997
6e751a49a9 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-04 16:00:35 +08:00
DESKTOP-369JRHT\12997
42106949ad no message 2024-07-04 16:00:32 +08:00
cun-nan
6c26448e5b bug 2024-07-04 15:45:53 +08:00
cun-nan
354eadeacf bug 2024-07-04 15:44:19 +08:00
DESKTOP-369JRHT\12997
a38c32f263 no message 2024-07-04 15:25:11 +08:00
xvv
2bb93c7705 前端 2024-07-04 13:55:13 +08:00
xvv
3e7a6abec7 前端 2024-07-04 10:43:02 +08:00
xvv
1e4b125198 前端 2024-07-04 09:47:52 +08:00
cun-nan
0f971b096e bug 2024-07-03 15:01:14 +08:00
xvv
e323275385 前端 2024-07-03 09:37:41 +08:00
DESKTOP-369JRHT\12997
5a6f6f63cf Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-06-24 09:50:33 +08:00
DESKTOP-369JRHT\12997
aecf29f0d3 no message 2024-06-24 09:50:29 +08:00
xvv
503f1f4f73 前端 2024-06-19 14:40:54 +08:00
xvv
b900896e0f 前端 2024-06-12 17:14:13 +08:00
DESKTOP-369JRHT\12997
12a790ab9a no message 2024-06-12 09:14:03 +08:00
DESKTOP-369JRHT\12997
f981c3062f Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
 2024-06-11 17:33:14 +08:00
DESKTOP-369JRHT\12997
c1d2a11486 no message 2024-06-11 17:32:40 +08:00
xvv
dd0181741b Merge remote-tracking branch 'origin/master' 2024-06-11 17:31:12 +08:00
xvv
6fa6970613 Merge remote-tracking branch 'origin/master' 2024-06-11 17:31:01 +08:00
DESKTOP-369JRHT\12997
7c71c1f2de Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	pos-uni/config.js
 2024-06-11 17:30:57 +08:00
xvv
6f4671b5e2 前端 2024-06-11 17:30:45 +08:00
DESKTOP-369JRHT\12997
a4411ed619 no message 2024-06-11 17:29:44 +08:00
齐天大圣
93b5665bb9 小程序支付bug 2024-06-11 14:32:22 +08:00
DESKTOP-369JRHT\12997
2e7f18845a no message 2024-06-06 17:16:22 +08:00
齐天大圣
16c93fbdd2 Merge remote-tracking branch 'origin/master' 2024-06-05 17:33:44 +08:00
齐天大圣
c0ef041238 小程序支付bug 2024-06-05 17:33:31 +08:00
DESKTOP-369JRHT\12997
791e98aa14 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintCashierWeb/.env.development
 2024-06-05 17:31:04 +08:00
cun-nan
7919f73a16 bug 2024-06-05 16:09:45 +08:00
DESKTOP-369JRHT\12997
cb39d52efe no message 2024-06-05 14:24:00 +08:00
DESKTOP-369JRHT\12997
c6771e52af Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-06-04 16:15:36 +08:00
DESKTOP-369JRHT\12997
f58d384840 no message 2024-06-04 16:15:30 +08:00
齐天大圣
bb36e6402c 手机号限制bug 2024-06-04 14:36:20 +08:00
DESKTOP-369JRHT\12997
b0d060edf0 no message 2024-05-31 18:15:41 +08:00
DESKTOP-369JRHT\12997
6ad75e4d1f no message 2024-05-31 08:53:59 +08:00
DESKTOP-369JRHT\12997
16f77aca55 no message 2024-05-30 16:43:03 +08:00
cun-nan
dfce05d949 bug 2024-05-27 16:56:51 +08:00
DESKTOP-369JRHT\12997
26ac5de97a Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-27 08:45:39 +08:00
DESKTOP-369JRHT\12997
18c1aa3843 no message 2024-05-27 08:45:36 +08:00
xvv
bfa10dd5c9 pos 端 2024-05-25 13:43:04 +08:00
cun-nan
1b2af2f8a2 bug 2024-05-23 09:26:04 +08:00
wangh
3acbf2bcda no message 2024-05-23 09:03:06 +08:00
wangh
3c9f416174 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintCashierWeb/.env.development
 2024-05-22 17:14:32 +08:00
wangh
ed7538594e no message 2024-05-22 17:13:13 +08:00
wangh
963c46324c no message 2024-05-22 17:12:19 +08:00
cun-nan
513948427c bug 2024-05-22 14:27:40 +08:00
wangh
74a67d07e3 no message 2024-05-20 09:03:12 +08:00
wangh
302abd49e9 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-17 16:14:23 +08:00
wangh
5cfc735ae4 no message 2024-05-17 16:14:18 +08:00
cun-nan
7b5d47d115 bug 2024-05-17 16:08:44 +08:00
wangh
fd3d60adce 1 2024-05-16 14:27:22 +08:00
cun-nan
ff0af40e39 bug 2024-05-10 17:36:24 +08:00
齐天大圣
7bb6e6dcc5 Merge remote-tracking branch 'origin/master' 2024-05-08 11:14:25 +08:00
齐天大圣
a7fb4a6d08 登录bug 2024-05-08 11:14:16 +08:00
wangh
73edd03038 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-08 09:03:56 +08:00
wangh
02c9f2c113 打印机对接 2024-05-08 09:03:51 +08:00
齐天大圣
382ac53cc1 核销bug 2024-04-29 17:57:39 +08:00
齐天大圣
15d263d203 bug 2024-04-09 09:23:11 +08:00
齐天大圣
c2229eb228 bug 2024-04-02 17:23:09 +08:00
齐天大圣
ef18fbbfc8 角色权限 2024-03-30 15:09:32 +08:00
齐天大圣
07d8762081 bug 2024-03-30 14:14:06 +08:00
齐天大圣
efa9d6057f bug 2024-03-29 16:58:57 +08:00