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

674 Commits

Author SHA1 Message Date
@QQNZX
b3e199acb6 11.15 2023-11-15 18:42:06 +08:00
齐天大圣
1c320b17c1 折扣营销 2023-11-15 18:26:05 +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
@QQNZX
4feda12365 11.11 2023-11-13 10:04:51 +08:00
cun-nan
79134699fd 收银台 2023-11-11 18:04:49 +08:00
wangh
5d67b7cbb3 充值 2023-11-11 18:02:25 +08:00
@QQNZX
492e53ca49 Merge remote-tracking branch 'origin/master' 2023-11-11 17:54:12 +08:00
@QQNZX
bd14aef39b 11.11 2023-11-11 17:54:03 +08:00
wangh
3227f9b44b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-11 13:28:09 +08:00
@QQNZX
aab74f80c3 11.11 2023-11-11 10:57:49 +08:00
wangh
b1b4e1c94d 积分 2023-11-10 18:19:33 +08:00
cun-nan
42b625266d 收银台 2023-11-10 18:10:23 +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
齐天大圣
04e5fc97be 修改优惠券在线下线默认值 2023-11-09 13:53:02 +08:00
DESKTOP-369JRHT\12997
9e2b9068a2 积分 2023-11-08 18:08:54 +08:00
cun-nan
3c1a0c7ca9 收银台 2023-11-08 18:07:17 +08:00
user
55d4e8631d 11.6 2023-11-08 17:01:44 +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
user
8e3d5b15ac Merge remote-tracking branch 'origin/master' 2023-11-07 09:31:57 +08:00
齐天大圣
557aba50c7 兑换券 2023-11-07 09:31:13 +08:00
user
b9dceb5426 Merge remote-tracking branch 'origin/master' 2023-11-07 09:01:34 +08:00
user
6d2d22be32 11.6 2023-11-06 18:07:31 +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
DESKTOP-369JRHT\12997
46d6afad1d 积分商城 2023-11-03 17:59:55 +08:00
cun-nan
5472e4253b 便利店 2023-11-03 15:59:38 +08:00
齐天大圣
88151c5fc8 Merge remote-tracking branch 'origin/master' 2023-11-03 15:58:49 +08:00
齐天大圣
15310c076c 油卡bug 2023-11-03 15:58:40 +08:00
user
0d2960b96c 三个跳转 2023-11-03 15:57:15 +08:00
齐天大圣
4c6c8b57b8 油卡bug 2023-11-03 15:45:54 +08:00
user
86fb080188 10.17 16：57 2023-11-03 11:07:29 +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
user
486da7ca40 10.17 16：57 2023-10-31 18:16:38 +08:00
DESKTOP-369JRHT\12997
3b64ce321f 更新货品审核的字典 2023-10-31 18:08:17 +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
DESKTOP-369JRHT\12997
189d0533ee 商品货损 2023-10-30 18:09:11 +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
2b6850b251 便利店 2023-10-26 16:02:04 +08:00
DESKTOP-369JRHT\12997
2af2037ed1 no message 2023-10-26 15:01:02 +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
DESKTOP-369JRHT\12997
90b60aaadc Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
 2023-10-26 11:44:24 +08:00
DESKTOP-369JRHT\12997
ff3f7ff1b7 1 2023-10-26 11:43:30 +08:00
cun-nan
19abf7e302 便利店 2023-10-26 11:04:48 +08:00
user
5040d2d9e1 收银台 2023-10-26 09:32:37 +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
cun-nan
36687535b7 会员管理 固定等级 2023-10-25 13:17:49 +08:00
DESKTOP-369JRHT\12997
090f3842fe 修改 2023-10-25 09:25:42 +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
DESKTOP-369JRHT\12997
20bc144bb3 盘点 2023-10-23 15:06:57 +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
cun-nan
3fd0db5a0d 会员管理 2023-10-20 18:42:38 +08:00
DESKTOP-369JRHT\12997
3738223f88 盘点 进油 2023-10-20 18:02:47 +08:00
cun-nan
ab6a4a5279 会员管理 2023-10-19 18:47:09 +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
user
0ff11ec140 10.17 16：57 2023-10-18 11:26:57 +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
user
3d4dd71360 10.17 16：57 2023-10-17 16:59:16 +08:00
user
fd58df1926 10.17 16：57 2023-10-17 16:57:53 +08:00
user
e3bade14f9 Merge remote-tracking branch 'origin/master' 2023-10-17 16:48:09 +08:00
user
5c8b3f0b2b 10.17 16：47 2023-10-17 16:47:55 +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
cun-nan
ad00a75e67 门店信息 2023-10-14 18:02:31 +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
cun-nan
f43d436015 门店信息 2023-10-12 18:50:33 +08:00
DESKTOP-369JRHT\12997
f9940568ac 油品管理 2023-10-12 18:44:46 +08:00
cun-nan
326a5834be 员工管理 2023-10-12 15:49:06 +08:00
DESKTOP-369JRHT\12997
b365d25dc0 修改 2023-10-12 11:57:09 +08:00
cun-nan
212e2d5cca 员工管理 2023-10-11 18:45:54 +08:00
user
af2b03dd44 Merge remote-tracking branch 'origin/master' 2023-10-11 18:34:41 +08:00
user
f2d0a6494a 10.10 下班前的最后一舞 2023-10-11 18:34:24 +08:00
cun-nan
29f78ae021 员工管理 2023-10-10 18:58:08 +08:00
user
0c376945aa 10.10 初始话 2023-10-10 18:36:00 +08:00
user
791feaee5a '121' 2023-10-10 17:39:35 +08:00
13405411873
1437fa9ed7 init 2023-10-09 11:12:49 +08:00