|
|
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 |
|
|
|
deb613b44e
|
bug
|
2024-06-12 16:21:04 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ca020b8c2a
|
Merge remote-tracking branch 'origin/master'
|
2024-06-05 17:39:06 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6e5addb78c
|
Merge remote-tracking branch 'origin/master'
|
2024-05-31 09:01:29 +08:00 |
|
|
|
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 |
|
|
|
a7792e4b20
|
bug
|
2024-05-29 17:37:23 +08:00 |
|
DESKTOP-369JRHT\12997
|
aff136295e
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
# Conflicts:
# pos-uni/pages/my/my.vue
|
2024-05-29 15:16:16 +08:00 |
|
DESKTOP-369JRHT\12997
|
3ab8bb27d5
|
no message
|
2024-05-29 15:15:33 +08:00 |
|
|
|
70d1a50a04
|
bug
|
2024-05-29 11:05:24 +08:00 |
|
|
|
39d6919db3
|
pos首页前三个订单
|
2024-05-29 10:28:39 +08:00 |
|
DESKTOP-369JRHT\12997
|
9269d6cbb3
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
|
2024-05-28 14:17:55 +08:00 |
|
DESKTOP-369JRHT\12997
|
3e6420346c
|
no message
|
2024-05-28 14:17:49 +08:00 |
|
|
|
ea25f5e16d
|
Merge remote-tracking branch 'origin/master'
|
2024-05-28 14:10:20 +08:00 |
|
|
|
f1d71d2a22
|
bug
|
2024-05-28 14:10:07 +08:00 |
|
|
|
f2cf5bffdb
|
bug
|
2024-05-28 14:06:53 +08:00 |
|
|
|
5549f1d0c7
|
bug
|
2024-05-28 09:01:56 +08:00 |
|
DESKTOP-369JRHT\12997
|
6be451328e
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
|
2024-05-28 08:40:22 +08:00 |
|
DESKTOP-369JRHT\12997
|
e8ab427cdc
|
no message
|
2024-05-28 08:40:17 +08:00 |
|
|
|
dfce05d949
|
bug
|
2024-05-27 16:56:51 +08:00 |
|
|
|
c0edca907c
|
Merge remote-tracking branch 'origin/master'
|
2024-05-27 08:44:55 +08:00 |
|
xvv
|
bfa10dd5c9
|
pos 端
|
2024-05-25 13:43:04 +08:00 |
|
DESKTOP-369JRHT\12997
|
3453f37647
|
no message
|
2024-05-24 17:50:55 +08:00 |
|
|
|
3b86da3ef5
|
bug
|
2024-05-24 16:44:13 +08:00 |
|
|
|
0a47825124
|
bug
|
2024-05-23 15:56:57 +08:00 |
|
wangh
|
0cc396634b
|
no message
|
2024-05-23 12:01:13 +08:00 |
|
wangh
|
e35ead2d45
|
no message
|
2024-05-23 11:47:58 +08:00 |
|
wangh
|
a506009491
|
no message
|
2024-05-23 09:39:52 +08:00 |
|
|
|
1b2af2f8a2
|
bug
|
2024-05-23 09:26:04 +08:00 |
|
wangh
|
14a3c56a73
|
no message
|
2024-05-23 09:18:59 +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
|
963c46324c
|
no message
|
2024-05-22 17:12:19 +08:00 |
|
|
|
513948427c
|
bug
|
2024-05-22 14:27:40 +08:00 |
|
|
|
c2fed313b9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java
|
2024-05-21 09:51:11 +08:00 |
|
|
|
226cab681e
|
优惠统计
|
2024-05-21 09:50:27 +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 |
|
|
|
7b5d47d115
|
bug
|
2024-05-17 16:08:44 +08:00 |
|
|
|
9e2a581288
|
Merge remote-tracking branch 'origin/master'
|
2024-05-17 10:50:19 +08:00 |
|
|
|
8759010ef0
|
优惠统计
|
2024-05-17 10:50:07 +08:00 |
|
wangh
|
764f01fd3d
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
|
2024-05-16 14:27:26 +08:00 |
|
wangh
|
fd3d60adce
|
1
|
2024-05-16 14:27:22 +08:00 |
|
|
|
8dad55a71a
|
Merge remote-tracking branch 'origin/master'
|
2024-05-15 16:04:38 +08:00 |
|
|
|
81f2dd4968
|
优惠统计
|
2024-05-15 16:04:27 +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 |
|
|
|
be2258b6c7
|
囤油锁价
|
2024-05-13 11:09:12 +08:00 |
|
|
|
4dc581ef2b
|
Merge remote-tracking branch 'origin/master'
|
2024-05-11 13:53:53 +08:00 |
|
|
|
d4b8578e73
|
囤油锁价
|
2024-05-11 13:53:47 +08:00 |
|
|
|
29e40a4132
|
囤油锁价
|
2024-05-11 08:38:33 +08:00 |
|
|
|
ff0af40e39
|
bug
|
2024-05-10 17:36:24 +08:00 |
|
|
|
fa64cf61b6
|
囤油锁价
|
2024-05-10 17:28:09 +08:00 |
|
|
|
88db1d93a0
|
囤油锁价
|
2024-05-10 17:25:54 +08:00 |
|
|
|
2515d22ede
|
Merge remote-tracking branch 'origin/master'
|
2024-05-10 16:54:19 +08:00 |
|
|
|
44a1a82b81
|
囤油锁价
|
2024-05-10 16:54:08 +08:00 |
|
|
|
ba88d5bda1
|
bug
|
2024-05-10 11:54:12 +08:00 |
|
wangh
|
ef49ddc855
|
Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
|
2024-05-08 16:37:29 +08:00 |
|
wangh
|
54ba73dae3
|
no message
|
2024-05-08 16:29:05 +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 |
|
|
|
519848f5bb
|
bug
|
2024-05-08 08:55:23 +08:00 |
|
|
|
cfec1751bb
|
登录bug
|
2024-04-30 16:11:09 +08:00 |
|
|
|
5a10249514
|
登录bug
|
2024-04-30 09:56:13 +08:00 |
|
|
|
382ac53cc1
|
核销bug
|
2024-04-29 17:57:39 +08:00 |
|
|
|
a45fde5373
|
核销bug
|
2024-04-29 16:55:31 +08:00 |
|
|
|
3e51cf1e03
|
支付bug
|
2024-04-28 17:09:01 +08:00 |
|
|
|
59065d2c00
|
优惠券bug
|
2024-04-28 12:04:22 +08:00 |
|
|
|
28acf1ff82
|
积分变化
|
2024-04-28 10:32:06 +08:00 |
|
|
|
faa7a57288
|
加油次数
|
2024-04-28 09:30:43 +08:00 |
|
|
|
bdb0cc45fe
|
bug
|
2024-04-28 09:17:05 +08:00 |
|
|
|
ee9221494e
|
bug
|
2024-04-28 09:16:14 +08:00 |
|
|
|
bc13cc8d40
|
bug
|
2024-04-28 09:10:38 +08:00 |
|
|
|
f0d00a61e1
|
bug
|
2024-04-26 13:42:56 +08:00 |
|
|
|
8dcffd19a4
|
bug
|
2024-04-24 15:53:11 +08:00 |
|
|
|
9e46716280
|
bug
|
2024-04-24 13:29:48 +08:00 |
|
|
|
c5c7d7c7f5
|
bug
|
2024-04-10 22:27:32 +08:00 |
|
|
|
25cf450810
|
bug
|
2024-04-10 16:39:29 +08:00 |
|
|
|
46a0106ab7
|
bug
|
2024-04-09 16:01:14 +08:00 |
|
|
|
62fec8eec4
|
bug
|
2024-04-09 09:37:17 +08:00 |
|
|
|
15d263d203
|
bug
|
2024-04-09 09:23:11 +08:00 |
|
|
|
edef89438d
|
bug
|
2024-04-03 10:28:47 +08:00 |
|
|
|
c2229eb228
|
bug
|
2024-04-02 17:23:09 +08:00 |
|
|
|
c16d957e8e
|
bug
|
2024-04-02 10:25:38 +08:00 |
|
|
|
ee9fd4904b
|
bug
|
2024-03-30 16:54:06 +08:00 |
|
|
|
044cf386d5
|
bug
|
2024-03-30 16:53:20 +08:00 |
|
|
|
d024f8b8d7
|
bug
|
2024-03-30 16:10:38 +08:00 |
|
|
|
7c6a613e5e
|
bug
|
2024-03-30 15:40:05 +08:00 |
|
|
|
07d8762081
|
bug
|
2024-03-30 14:14:06 +08:00 |
|
|
|
efa9d6057f
|
bug
|
2024-03-29 16:58:57 +08:00 |
|
|
|
bc01b68b65
|
bug
|
2024-03-29 15:56:55 +08:00 |
|
|
|
3e05c8ce4d
|
Merge remote-tracking branch 'origin/master'
|
2024-03-29 13:43:16 +08:00 |
|
|
|
339e280c4d
|
bug
|
2024-03-29 13:42:53 +08:00 |
|
|
|
60b52b53b3
|
bug
|
2024-03-29 13:18:58 +08:00 |
|
|
|
74ffebbfce
|
bug
|
2024-03-28 15:23:00 +08:00 |
|
|
|
8213ccd1cc
|
bug
|
2024-03-28 15:04:40 +08:00 |
|
|
|
af93731749
|
bug
|
2024-03-28 15:04:24 +08:00 |
|
|
|
393629664a
|
bug
|
2024-03-28 14:39:24 +08:00 |
|
|
|
3a5c70f9cf
|
bug
|
2024-03-28 10:17:11 +08:00 |
|
