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

159 Commits

Author SHA1 Message Date
cun-nan
a61a99cde7 优化项 2024-01-10 18:09:46 +08:00
齐天大圣
c54a35084f Merge remote-tracking branch 'origin/master' 2024-01-10 13:54:55 +08:00
齐天大圣
ce2f96006b 修改bug 2024-01-10 13:54:45 +08:00
cun-nan
eaa527e109 优化项 2024-01-10 13:45:02 +08:00
齐天大圣
d92c33373a 修改bug 2024-01-05 18:19:48 +08:00
cun-nan
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
cun-nan
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
cun-nan
b5d55b69f1 优化项 2024-01-02 18:36:47 +08:00
cun-nan
76befae703 优化项 2024-01-02 17:13:25 +08:00
wangh
087ce92cbf 中台处理 2023-12-22 15:33:38 +08:00
cun-nan
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
wangh
026b7e6d0b 主页的数据统计 2023-12-18 17:42:52 +08:00
wangh
f0f50652e3 pc端 增加个人统计 和数据统计 2023-12-14 13:39:27 +08:00
cun-nan
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
cun-nan
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00
cun-nan
491c8bf426 会员信息 2023-11-29 16:26:19 +08:00
@QQNZX
e7ebac6b34 Merge remote-tracking branch 'origin/master' 2023-11-25 15:31:18 +08:00
@QQNZX
2dee747f0c 11.22前端 2023-11-25 15:31:09 +08:00
cun-nan
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
cun-nan
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
wangh
b2574cc2cb 会员等级和进油修改 2023-11-22 18:05:02 +08:00
@QQNZX
17a7860505 11.21前端 2023-11-21 09:09:52 +08:00
@QQNZX
0747a79c6f 11.16 2023-11-17 13:09:47 +08:00
@QQNZX
dde0c7d4ee 11.16 2023-11-16 17:50:02 +08:00
@QQNZX
f0342e4544 11.16 2023-11-16 10:55:35 +08:00
齐天大圣
758442ff37 Merge remote-tracking branch 'origin/master' 2023-11-15 19:36:20 +08:00
齐天大圣
8581ade77e 新人有礼 2023-11-15 19:36:12 +08:00
@QQNZX
b3e199acb6 11.15 2023-11-15 18:42:06 +08:00
@QQNZX
6a8849aea4 11.15 2023-11-15 14:33:51 +08:00
@QQNZX
793e5c9e39 11.15 2023-11-15 09:09:34 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
@QQNZX
7ab789ba2a 11.11 2023-11-14 16:08:33 +08:00
齐天大圣
6400889d3c 营销活动 2023-11-14 11:27:58 +08:00
cun-nan
4f69e72145 Merge remote-tracking branch 'origin/master' 2023-11-13 19:01:25 +08:00
cun-nan
f72db0c784 收银台 2023-11-13 18:59:13 +08:00
wangh
f2a65be97f 存油 2023-11-13 18:58:31 +08:00
wangh
22aee4bb01 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-13 16:54:24 +08:00
wangh
b080f3e344 前端支付 2023-11-13 16:54:15 +08:00
cun-nan
c06e8b1c59 收银台 2023-11-13 16:51:57 +08:00
wangh
5d67b7cbb3 充值 2023-11-11 18:02:25 +08:00
@QQNZX
aab74f80c3 11.11 2023-11-11 10:57:49 +08:00
cun-nan
62f5e61959 收银台 2023-11-10 14:59:23 +08:00
DESKTOP-369JRHT\12997
46e0745947 积分设置 2023-11-09 18:31:36 +08:00
user
94f072b247 11.6 2023-11-08 16:38:22 +08:00
user
c1b7ef61b5 11.6 2023-11-08 14:58:40 +08:00
齐天大圣
4d28a69c94 Merge remote-tracking branch 'origin/master' 2023-11-08 09:33:29 +08:00
齐天大圣
94adf07fa8 优惠券 2023-11-08 09:33:11 +08:00
user
2c9cbb0bc6 11.6 2023-11-08 09:18:49 +08:00
DESKTOP-369JRHT\12997
96497a7be9 积分订单 2023-11-07 18:04:43 +08:00
user
673b6ad10a 11.6 2023-11-07 13:31:31 +08:00
齐天大圣
557aba50c7 兑换券 2023-11-07 09:31:13 +08:00
DESKTOP-369JRHT\12997
092ce688cc 积分商品 2023-11-06 17:52:12 +08:00
user
c44c43d9bb 11.6 2023-11-06 11:53:56 +08:00
user
a0f9d68658 11.6 2023-11-06 10:31:30 +08:00
cun-nan
5472e4253b 便利店 2023-11-03 15:59:38 +08:00
user
5f7bfc1652 10.17 16：57 2023-11-03 08:52:27 +08:00
cun-nan
590bad37d3 便利店 2023-11-02 18:38:22 +08:00
DESKTOP-369JRHT\12997
089dcbabbe 积分商城 2023-11-02 18:32:07 +08:00
cun-nan
906b804b2b 便利店 2023-10-31 18:18:30 +08:00
DESKTOP-369JRHT\12997
9ea5b605ad 商品进货退货盘点货损 2023-10-31 17:55:49 +08:00
DESKTOP-369JRHT\12997
70b1a6d39a 1 2023-10-31 08:54:40 +08:00
cun-nan
5e06f4582f 便利店 2023-10-30 18:01:53 +08:00
DESKTOP-369JRHT\12997
bf244b1f50 商品 2023-10-28 17:12:18 +08:00
cun-nan
92eafa75ec 便利店 2023-10-28 15:03:28 +08:00
cun-nan
217a549247 便利店 2023-10-28 13:33:42 +08:00
DESKTOP-369JRHT\12997
70553d8615 退货 2023-10-28 09:04:27 +08:00
DESKTOP-369JRHT\12997
2a586c09ba Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-10-27 18:07:02 +08:00
DESKTOP-369JRHT\12997
179438917a 进货 退货 2023-10-27 18:06:09 +08:00
cun-nan
afa7d57bef 便利店 2023-10-27 18:04:07 +08:00
cun-nan
a7a60eb124 便利店 2023-10-27 16:29:53 +08:00
cun-nan
57f5d5489c 便利店 2023-10-27 10:49:09 +08:00
DESKTOP-369JRHT\12997
98a517e02b 便利店 2023-10-26 18:01:14 +08:00
cun-nan
f697d2bba8 便利店 2023-10-26 18:00:10 +08:00
cun-nan
9ca2e2e609 便利店 2023-10-26 14:53:44 +08:00
DESKTOP-369JRHT\12997
2eae3a90aa 油站结尾 - 进货开头 2023-10-26 13:52:13 +08:00
cun-nan
19abf7e302 便利店 2023-10-26 11:04:48 +08:00
cun-nan
76d4ace2eb 会员管理 固定等级 2023-10-25 18:20:42 +08:00
DESKTOP-369JRHT\12997
fe075eeb54 审核 2023-10-25 18:19:09 +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
b3d5f153c9 审核 2023-10-24 19:07:56 +08:00
cun-nan
9cd211ed96 会员管理 固定等级 2023-10-24 18:51:29 +08:00
cun-nan
7e2c047e4d 会员管理 固定等级 2023-10-24 14:00:29 +08:00
DESKTOP-369JRHT\12997
f95867e000 修改 2023-10-23 18:25:27 +08:00
cun-nan
a28df63a64 会员管理 固定等级 2023-10-23 18:23:08 +08:00
user
18cbb90abd 10.17 16：57 2023-10-23 15:17:08 +08:00
cun-nan
fe0ec44dff 会员管理 2023-10-23 15:03:48 +08:00
DESKTOP-369JRHT\12997
69feab70bc 进油 盘点 2023-10-23 15:03:04 +08:00
DESKTOP-369JRHT\12997
3738223f88 盘点 进油 2023-10-20 18:02:47 +08:00
DESKTOP-369JRHT\12997
b990ed0b86 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-10-19 17:47:12 +08:00
DESKTOP-369JRHT\12997
9e9a19afc4 进油 订单 2023-10-19 17:47:05 +08:00
liujinfeng@rd.sdtwxx.com
c3aeb3eec4 商品分类管理前台页面提交 2023-10-19 13:05:47 +08:00
cun-nan
c828a46a79 会员管理 2023-10-18 18:31:46 +08:00
DESKTOP-369JRHT\12997
b8398df156 供应商 进油 2023-10-18 18:18:15 +08:00
cun-nan
26cd3cdf7c 会员管理 2023-10-17 19:01:29 +08:00
DESKTOP-369JRHT\12997
ee68993784 油罐 油枪 2023-10-17 18:44:33 +08:00
DESKTOP-369JRHT\12997
9ae8544361 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-10-17 09:03:41 +08:00
DESKTOP-369JRHT\12997
e9e3fcef5f 油罐 定时任务 2023-10-17 09:03:36 +08:00
cun-nan
e0385816b3 会员管理 2023-10-16 18:04:58 +08:00
DESKTOP-369JRHT\12997
e89ddfecab 油价 2023-10-13 18:14:19 +08:00
cun-nan
c63b6018a1 门店信息 2023-10-13 18:11:05 +08:00