|
|
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 |
|
|
|
926d47c97f
|
bug
|
2024-07-04 08:41:20 +08:00 |
|
|
|
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 |
|
|
|
fcf5d4b06c
|
小程序支付bug
|
2024-06-06 08:35:59 +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 |
|
|
|
fe788d418a
|
pos支付bug
|
2024-06-05 11:51:31 +08:00 |
|
|
|
aa585f42bf
|
bug
|
2024-03-26 16:37:36 +08:00 |
|
|
|
3645e64d6f
|
bug
|
2024-03-11 09:53:30 +08:00 |
|
|
|
6e2e6830ed
|
bug
|
2024-03-04 14:25:20 +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 |
|
|
|
702dceb375
|
bug
|
2024-02-21 17:02:13 +08:00 |
|
@QQNZX
|
33575a8e95
|
前端
|
2024-02-06 09:10:18 +08:00 |
|
|
|
b1dedd5764
|
bug
|
2024-01-23 14:16:17 +08:00 |
|
wangh
|
1a5bb54d36
|
修改中台用户管理增加和修改的bug
|
2024-01-10 13:46:27 +08:00 |
|
wangh
|
3f857268a6
|
bug修改
|
2024-01-09 12:02:40 +08:00 |
|
@QQNZX
|
14f1b6fdd4
|
前端
|
2024-01-06 10:42:41 +08:00 |
|
|
|
eae119f033
|
优化项
|
2024-01-05 18:27:59 +08:00 |
|
wangh
|
ea900039d4
|
bug处理
|
2024-01-05 16:53:19 +08:00 |
|
|
|
cff6a8942b
|
优化项
|
2024-01-04 18:44:52 +08:00 |
|
wangh
|
adfb53bac2
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintAdmin_zt/.env.development
# fuintBackend/configure/dev/application.properties
# fuintBackend/fuint-application/src/main/resources/application.properties
# gasStation-uni/config.js
# gasStation-uni/pages/index/index.vue
|
2024-01-02 11:29:51 +08:00 |
|
wangh
|
9e403cd413
|
bug修改+中泰
|
2024-01-02 11:21:12 +08:00 |
|
@QQNZX
|
9974798e58
|
前端
|
2024-01-02 10:04:57 +08:00 |
|
|
|
323add1517
|
会员信息
|
2023-12-27 18:44:56 +08:00 |
|
wangh
|
0f7c14444d
|
完善站长一键登录+修改中台出现的bug
|
2023-12-27 09:11:43 +08:00 |
|
wangh
|
22d78d8b5f
|
小票打印--积分支付--中台设置流水
|
2023-12-26 09:50:37 +08:00 |
|
|
|
8a3ee12f1d
|
小程序支付
|
2023-12-20 16:04:56 +08:00 |
|
wangh
|
1956d1a25b
|
自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端）
|
2023-12-14 13:36:36 +08:00 |
|
wangh
|
b40a9d8efe
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-07 10:24:29 +08:00 |
|
wangh
|
08242aff89
|
no message
|
2023-12-07 10:23:33 +08:00 |
|
|
|
fbbe572286
|
优化活动
|
2023-12-06 18:00:48 +08:00 |
|
@QQNZX
|
1042b55806
|
12.05前端
|
2023-12-05 11:16:58 +08:00 |
|
wangh
|
28a26db27c
|
1
|
2023-11-29 16:48:44 +08:00 |
|
|
|
9d79c997a6
|
营销活动
|
2023-11-14 11:20:08 +08:00 |
|
DESKTOP-369JRHT\12997
|
9ea5b605ad
|
商品进货退货盘点货损
|
2023-10-31 17:55:49 +08:00 |
|
|
|
5040d2d9e1
|
收银台
|
2023-10-26 09:32:37 +08:00 |
|
|
|
b0b04f4349
|
处理
|
2023-10-25 14:40:20 +08:00 |
|
DESKTOP-369JRHT\12997
|
51df6fc295
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/configure/dev/application.properties
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-10-24 19:10:39 +08:00 |
|
DESKTOP-369JRHT\12997
|
128b3a0251
|
1
|
2023-10-24 19:09:04 +08:00 |
|
|
|
8352210bfa
|
123
|
2023-10-24 18:52:17 +08:00 |
|
|
|
c963066385
|
处理
|
2023-10-11 18:37:04 +08:00 |
|
|
|
ed2035cd52
|
处理
|
2023-10-10 09:09:01 +08:00 |
|
|
|
1437fa9ed7
|
init
|
2023-10-09 11:12:49 +08:00 |
|
