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

1078 Commits

Author SHA1 Message Date
DESKTOP-369JRHT\12997
b400283d2e no message 2024-07-22 09:49:09 +08:00
愉快的大福
4a8345a964 硬件商城 2024-07-22 08:44:18 +08:00
DESKTOP-369JRHT\12997
c6fa5a5291 no message 2024-07-21 17:03:31 +08:00
DESKTOP-369JRHT\12997
4de32d74bd Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-19 09:13:25 +08:00
DESKTOP-369JRHT\12997
7619de2ccf no message 2024-07-19 09:13:22 +08:00
cun-nan
7fe4e8355b bug 2024-07-18 16:14:13 +08:00
DESKTOP-369JRHT\12997
53fba7f255 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-18 14:25:05 +08:00
DESKTOP-369JRHT\12997
f7967ec64c banner 2024-07-18 14:24:58 +08:00
cun-nan
3328609a09 bug 2024-07-17 17:58:23 +08:00
cun-nan
60e073493e bug 2024-07-17 08:29:04 +08:00
DESKTOP-369JRHT\12997
8a86d5b0e9 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-15 17:56:18 +08:00
DESKTOP-369JRHT\12997
3e77c29858 no message 2024-07-15 17:56:15 +08:00
cun-nan
e823cba720 bug 2024-07-15 17:48:10 +08:00
DESKTOP-369JRHT\12997
24c476cb57 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-15 16:52:09 +08:00
DESKTOP-369JRHT\12997
eeebaaaa51 no message 2024-07-15 16:52:04 +08:00
cun-nan
86eb74e8de bug 2024-07-15 15:05:28 +08:00
cun-nan
3732907055 bug 2024-07-12 17:13:53 +08:00
cun-nan
1669c9150e bug 2024-07-12 14:30:33 +08:00
cun-nan
dfa51f9e49 bug 2024-07-12 08:48:05 +08:00
DESKTOP-369JRHT\12997
adf5b1ea7a Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-11 18:20:25 +08:00
DESKTOP-369JRHT\12997
47c4cf462b no message 2024-07-11 18:18:38 +08:00
cun-nan
ce64a1ea41 bug 2024-07-11 17:21:46 +08:00
DESKTOP-369JRHT\12997
b1c92b7bfc Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-07-11 14:48:40 +08:00
DESKTOP-369JRHT\12997
fd47dfec2b no message 2024-07-11 14:48:35 +08:00
cun-nan
6fcd0c89ff bug 2024-07-11 14:47:59 +08:00
DESKTOP-369JRHT\12997
32da0650d8 no message 2024-07-11 10:52:41 +08:00
cun-nan
aeda1c14ef bug 2024-07-11 10:16:14 +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
cd4d74e2ac no message 2024-07-11 10:00:57 +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
cun-nan
53fa99e0b2 bug 2024-07-09 15:20:26 +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
cun-nan
f075b31b3a bug 2024-07-06 15:02:10 +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
cun-nan
926d47c97f bug 2024-07-04 08:41:20 +08:00
cun-nan
0f971b096e bug 2024-07-03 15:01:14 +08:00
DESKTOP-369JRHT\12997
1b931f6c2d no message 2024-07-03 10:35:23 +08:00
xvv
503f1f4f73 前端 2024-06-19 14:40:54 +08:00
齐天大圣
b724be310e 订单bug 2024-06-14 10:04:25 +08:00
齐天大圣
e6d42baa84 Merge remote-tracking branch 'origin/master' 2024-06-12 16:29:35 +08:00
齐天大圣
af9e4836c2 小程序支付bug 2024-06-12 16:29:28 +08:00
cun-nan
deb613b44e bug 2024-06-12 16:21:04 +08:00
cun-nan
c309d2bf72 bug 2024-06-12 11:16:37 +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
DESKTOP-369JRHT\12997
a4411ed619 no message 2024-06-11 17:29:44 +08:00
齐天大圣
93b5665bb9 小程序支付bug 2024-06-11 14:32:22 +08:00
齐天大圣
40a882e898 Merge remote-tracking branch 'origin/master' 2024-06-06 17:38:23 +08:00
齐天大圣
d6cdb0c274 小程序支付bug 2024-06-06 17:38:15 +08:00
DESKTOP-369JRHT\12997
254dc19dad Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-06-06 17:16:26 +08:00
DESKTOP-369JRHT\12997
2e7f18845a no message 2024-06-06 17:16:22 +08:00
齐天大圣
b6fda98814 Merge remote-tracking branch 'origin/master' 2024-06-06 17:08:03 +08:00
齐天大圣
69dbe233cf 小程序支付bug 2024-06-06 17:07:07 +08:00
DESKTOP-369JRHT\12997
34854109bf Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java
 2024-06-06 11:56:42 +08:00
DESKTOP-369JRHT\12997
5a794a225d no message 2024-06-06 11:50:31 +08:00
cun-nan
a73308f067 bug 2024-06-06 11:49:38 +08:00
齐天大圣
c18c1f976b Merge remote-tracking branch 'origin/master' 2024-06-06 09:51:53 +08:00
齐天大圣
fcf5d4b06c 小程序支付bug 2024-06-06 08:35:59 +08:00
cun-nan
ca020b8c2a Merge remote-tracking branch 'origin/master' 2024-06-05 17:39:06 +08:00
cun-nan
9335d317a7 bug 2024-06-05 17:38:30 +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
DESKTOP-369JRHT\12997
3aea665caa no message 2024-06-05 17:22:15 +08:00
齐天大圣
c392e64f59 Merge remote-tracking branch 'origin/master' 2024-06-05 16:29:19 +08:00
齐天大圣
8d985addf8 小程序支付bug 2024-06-05 16:29:11 +08:00
cun-nan
7919f73a16 bug 2024-06-05 16:09:45 +08:00
齐天大圣
a89a6c5c27 小程序支付bug 2024-06-05 15:18:27 +08:00
齐天大圣
7c5c6a7088 pos支付bug 2024-06-05 14:47:06 +08:00
DESKTOP-369JRHT\12997
cb39d52efe no message 2024-06-05 14:24:00 +08:00
齐天大圣
fe788d418a pos支付bug 2024-06-05 11:51:31 +08:00
齐天大圣
79bc179929 Merge remote-tracking branch 'origin/master' 2024-06-04 16:32:18 +08:00
齐天大圣
71df91b54a pos支付bug 2024-06-04 16:32:09 +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
齐天大圣
5324586116 pos支付bug 2024-06-04 15:44:41 +08:00
齐天大圣
566a81a1e6 pos支付bug 2024-06-04 15:06:56 +08:00
齐天大圣
998109913b pos支付bug 2024-06-04 14:27:23 +08:00
齐天大圣
6c4bfeaac4 收款bug 2024-06-04 11:50:41 +08:00
齐天大圣
1f9f076cc1 pos支付bug 2024-06-03 18:12:12 +08:00
DESKTOP-369JRHT\12997
8bcf58ca2b Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
 2024-06-03 09:12:52 +08:00
齐天大圣
5419d6bf53 Merge remote-tracking branch 'origin/master' 2024-06-03 08:40:24 +08:00
齐天大圣
ccde099d3d bug 2024-06-03 08:40:17 +08:00
DESKTOP-369JRHT\12997
b0d060edf0 no message 2024-05-31 18:15:41 +08:00
DESKTOP-369JRHT\12997
4b7a37f890 no message 2024-05-31 10:37:17 +08:00
DESKTOP-369JRHT\12997
e2f89bd897 no message 2024-05-31 09:10:41 +08:00
DESKTOP-369JRHT\12997
67723cf45e no message 2024-05-31 09:06:45 +08:00
cun-nan
6e5addb78c Merge remote-tracking branch 'origin/master' 2024-05-31 09:01:29 +08:00
cun-nan
4cb73620e1 bug 2024-05-31 09:01:18 +08:00
DESKTOP-369JRHT\12997
1c3248a275 Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-31 08:54:03 +08:00
DESKTOP-369JRHT\12997
16f77aca55 no message 2024-05-30 16:43:03 +08:00
齐天大圣
fe84e7d8c7 pos 2024-05-30 16:15:30 +08:00
齐天大圣
6b07a13ce2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
 2024-05-30 16:07:17 +08:00
齐天大圣
8ee3862433 pos 2024-05-30 16:06:55 +08:00
DESKTOP-369JRHT\12997
d6684b413d Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem 2024-05-30 16:05:20 +08:00
DESKTOP-369JRHT\12997
543eb2d35e no message 2024-05-30 16:05:16 +08:00