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

267 Commits

Author SHA1 Message Date
DESKTOP-369JRHT\12997
1b39af91fd no message 2024-07-12 11:52:50 +08:00
cun-nan
14d8091291 bug 2024-07-12 09:59:12 +08:00
xvv
06ddd48db7 前端 2024-07-12 08:52:24 +08:00
cun-nan
dfa51f9e49 bug 2024-07-12 08:48:05 +08:00
cun-nan
ce64a1ea41 bug 2024-07-11 17:21:46 +08:00
cun-nan
b7dc3f3428 bug 2024-07-11 15:31:20 +08:00
cun-nan
6fcd0c89ff bug 2024-07-11 14:47:59 +08:00
cun-nan
aeda1c14ef bug 2024-07-11 10:16:14 +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
xvv
35494fb1d6 前端 2024-07-09 18:00:49 +08:00
cun-nan
9b8d4bf4d9 bug 2024-07-09 17:31:24 +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
b3a1c3df30 bug 2024-07-09 14:24:12 +08:00
cun-nan
15c4c2ed3d bug 2024-07-08 17:52:02 +08:00
xvv
9df5ee4f7d 前端 2024-07-08 17:51:30 +08:00
xvv
11b1bd3580 前端 2024-07-08 13:58:17 +08:00
xvv
f2592d8a0b 前端 2024-07-08 11:43:00 +08:00
xvv
461ed2f442 Merge remote-tracking branch 'origin/master' 2024-07-08 11:39:57 +08:00
xvv
16621a47c5 前端 2024-07-08 11:39:38 +08:00
cun-nan
efb33ec2fb bug 2024-07-08 08:34:36 +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
xvv
b411834ea5 Merge remote-tracking branch 'origin/master' 2024-07-06 17:12:05 +08:00
xvv
0a61294e3a 前端 2024-07-06 17:11:39 +08:00
cun-nan
958a904cec bug 2024-07-06 16:52:28 +08:00
cun-nan
7d4fcce010 bug 2024-07-06 16:35:40 +08:00
xvv
093e84ac92 Merge remote-tracking branch 'origin/master' 2024-07-06 15:03:01 +08:00
xvv
4d8dfc98af 前端 2024-07-06 15:02:47 +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
cun-nan
c6830ae865 bug 2024-07-06 09:47:26 +08:00
DESKTOP-369JRHT\12997
f66644e922 no message 2024-07-05 14:12:31 +08:00
DESKTOP-369JRHT\12997
8e63b8d2e3 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
 2024-07-04 14:00:20 +08:00
DESKTOP-369JRHT\12997
78f348165f no message 2024-07-04 13:57:49 +08:00
xvv
1e4b125198 前端 2024-07-04 09:47:52 +08:00
DESKTOP-369JRHT\12997
98f063b9d1 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-04 08:42:18 +08:00
DESKTOP-369JRHT\12997
3cd2493c5d no message 2024-07-04 08:42:14 +08:00
cun-nan
0f971b096e bug 2024-07-03 15:01:14 +08:00
DESKTOP-369JRHT\12997
7e0b52f144 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-03 10:35:26 +08:00
DESKTOP-369JRHT\12997
1b931f6c2d no message 2024-07-03 10:35:23 +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
齐天大圣
3d8cba8da4 优化 2024-06-12 17:43:37 +08:00
xvv
b900896e0f 前端 2024-06-12 17:14:13 +08:00
DESKTOP-369JRHT\12997
c1d2a11486 no message 2024-06-11 17:32:40 +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
DESKTOP-369JRHT\12997
3aea665caa no message 2024-06-05 17:22:15 +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
f58d384840 no message 2024-06-04 16:15:30 +08:00
xvv
bfa10dd5c9 pos 端 2024-05-25 13:43:04 +08:00
cun-nan
0a47825124 bug 2024-05-23 15:56:57 +08:00
wangh
14a3c56a73 no message 2024-05-23 09:18:59 +08:00
wangh
3acbf2bcda no message 2024-05-23 09:03:06 +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
wangh
fd3d60adce 1 2024-05-16 14:27:22 +08:00
wangh
497fc5a6e7 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
 2024-05-13 14:21:18 +08:00
wangh
17a10d4f1b no message 2024-05-13 14:18:31 +08:00
齐天大圣
3be345115b Merge remote-tracking branch 'origin/master' 2024-05-11 08:44:30 +08:00
wangh
54ba73dae3 no message 2024-05-08 16:29:05 +08:00
wangh
02c9f2c113 打印机对接 2024-05-08 09:03:51 +08:00
齐天大圣
a76908b9ee bug 2024-05-07 17:29:52 +08:00
齐天大圣
6d244e8aa8 bug 2024-04-23 09:35:07 +08:00
齐天大圣
cfe09ba8b0 bug 2024-04-09 09:28:04 +08:00
齐天大圣
90225ffdc2 mapai 2024-04-02 17:23:32 +08:00
齐天大圣
c5d75cf308 mapai 2024-04-02 10:26:30 +08:00
齐天大圣
84df26d334 mapai 2024-03-30 15:09:09 +08:00
cun-nan
935466ffde bug 2024-03-29 14:13:48 +08:00
cun-nan
7bf9f0274f bug 2024-03-29 13:40:45 +08:00
cun-nan
60b52b53b3 bug 2024-03-29 13:18:58 +08:00
齐天大圣
dd6c70f1ab mapai 2024-03-29 10:58:01 +08:00
齐天大圣
70a8744a58 Merge remote-tracking branch 'origin/master' 2024-03-29 10:28:17 +08:00
齐天大圣
d2aa41351d 重置密码 2024-03-29 10:28:00 +08:00
cun-nan
435bca9441 bug 2024-03-29 10:18:43 +08:00
cun-nan
9f0d8f7ca2 bug 2024-03-28 18:13:58 +08:00
cun-nan
19ca4609da bug 2024-03-28 15:35:13 +08:00
齐天大圣
ef0cf628b2 重置密码 2024-03-28 15:18:55 +08:00
cun-nan
393629664a bug 2024-03-28 14:39:24 +08:00
齐天大圣
c6a2f7ff72 重置密码 2024-03-28 13:47:54 +08:00
齐天大圣
b7b24a691b 重置密码 2024-03-28 13:46:03 +08:00
齐天大圣
0f264b3b9c 重置密码 2024-03-28 13:41:31 +08:00
齐天大圣
0994e3e564 码牌 2024-03-27 16:38:28 +08:00
cun-nan
d022e8d9be bug 2024-03-26 16:50:40 +08:00
cun-nan
70b3f29610 bug 2024-03-26 16:48:31 +08:00
@QQNZX
32acec2b3a 前端 2024-03-26 16:16:47 +08:00
齐天大圣
bf20b16a41 码牌 2024-03-26 13:32:16 +08:00
@QQNZX
2b7894cdc0 前端 2024-03-25 13:24:19 +08:00
@QQNZX
a0f10f34ae 前端 2024-03-25 09:08:32 +08:00
齐天大圣
443e3888f7 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintAdmin_zt/src/views/Site/index.vue
 2024-03-22 09:34:15 +08:00
齐天大圣
d22e6ade77 码牌 2024-03-22 09:33:41 +08:00
cun-nan
8b009c34d5 bug 2024-03-20 13:23:03 +08:00
cun-nan
c25d20b87b bug 2024-03-18 17:40:39 +08:00
cun-nan
fac80c5b77 bug 2024-03-18 14:33:55 +08:00
cun-nan
8c86c0a780 bug 2024-03-18 09:54:31 +08:00
cun-nan
13211d382d bug 2024-03-18 09:03:14 +08:00
cun-nan
e2c8850da2 bug 2024-03-16 13:40:36 +08:00
cun-nan
cc133579b4 bug 2024-03-15 11:03:37 +08:00
@QQNZX
bcac38e6ac 前端 2024-03-14 19:55:35 +08:00
cun-nan
c2f3279e5c bug 2024-03-14 10:46:35 +08:00
cun-nan
fab351bd41 bug 2024-03-12 15:52:45 +08:00
wangh
8ab4844445 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-03-05 16:59:22 +08:00
wangh
2e55066c72 no message 2024-03-05 16:42:59 +08:00
cun-nan
ed7b346706 bug 2024-03-05 09:11:51 +08:00
wangh
0264b284a3 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
 2024-03-04 16:48:14 +08:00
wangh
a504720e4c no message 2024-03-04 16:47:16 +08:00
cun-nan
6e2e6830ed bug 2024-03-04 14:25:20 +08:00
cun-nan
55e449a45d bug 2024-03-01 15:38:46 +08:00
wangh
973e7648d4 no message 2024-02-29 17:21:26 +08:00
@QQNZX
99358ea32b 前端 2024-02-27 09:12:28 +08:00
wangh
71ad3c3085 bug处理 2024-02-26 15:08:32 +08:00
wangh
6f6988b8b2 no message 2024-02-19 16:38:03 +08:00
wangh
a32a779fe0 no message 2024-02-05 17:35:38 +08:00
wangh
6c39c09d98 no message 2024-02-02 09:04:04 +08:00
cun-nan
3bf7dc3b70 bug 2024-02-01 17:52:17 +08:00
wangh
d789b8b85a bug修改 2024-02-01 11:31:55 +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
@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
60ccc78c46 bug 2024-01-29 09:50:28 +08:00
cun-nan
d51d2d3bb3 bug 2024-01-29 09:13:11 +08:00
cun-nan
249b30da4d bug 2024-01-27 09:05:50 +08:00
wangh
50dcb6898c 验证码登录 2024-01-26 16:57:27 +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
a09d3208af no message 2024-01-25 10:24:55 +08:00
wangh
f4f9ec07ff no message 2024-01-24 17:32:57 +08:00
cun-nan
b1dedd5764 bug 2024-01-23 14:16:17 +08:00
cun-nan
25cd5cb003 bug 2024-01-23 09:26:10 +08:00
cun-nan
06fcb5fe98 bug 2024-01-19 18:48:13 +08:00
cun-nan
1c806f5c4d bug 2024-01-18 18:15:24 +08:00
cun-nan
e9dd0600c2 bug 2024-01-17 14:14:19 +08:00
@QQNZX
89d2d71152 前端 2024-01-15 11:39:48 +08:00
cun-nan
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
cun-nan
686a0d2e03 bug 2024-01-12 18:03:02 +08:00
wangh
dde91a7108 中台增加订单 2024-01-12 13:58:51 +08:00
wangh
1a5bb54d36 修改中台用户管理增加和修改的bug 2024-01-10 13:46:27 +08:00
wangh
3f857268a6 bug修改 2024-01-09 12:02:40 +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