Commit Graph

118 Commits

Author SHA1 Message Date
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
0d2960b96c 三个跳转 2023-11-03 15:57:15 +08:00
3c0078066e 油卡活动进度 2023-11-03 15:46:41 +08:00
4c6c8b57b8 油卡bug 2023-11-03 15:45:54 +08:00
d464edbdf3 Merge remote-tracking branch 'origin/master' 2023-11-03 11:07:36 +08:00
86fb080188 10.17 16:57 2023-11-03 11:07:29 +08:00
5402c3b198 便利店 2023-11-03 09:08:04 +08:00
5f7bfc1652 10.17 16:57 2023-11-03 08:52:27 +08:00
590bad37d3 便利店 2023-11-02 18:38:22 +08:00
DESKTOP-369JRHT\12997
089dcbabbe 积分商城 2023-11-02 18:32:07 +08:00
7e6e73eeca 修改查询条件 2023-11-02 17:27:52 +08:00
98d8b99d82 添加线程池配置 2023-11-01 16:57:21 +08:00
7f168fe62d 礼品卡储值卡排序 2023-11-01 15:33:00 +08:00
cd9f03a59c 修改礼品卡新增数量判空 2023-11-01 14:07:27 +08:00
245b425a9e 储值卡、礼品卡、囤油卡 2023-11-01 13:59:36 +08:00
906b804b2b 便利店 2023-10-31 18:18:30 +08:00
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
5e06f4582f 便利店 2023-10-30 18:01:53 +08:00
DESKTOP-369JRHT\12997
ec60b58193 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-10-28 17:12:35 +08:00
DESKTOP-369JRHT\12997
bf244b1f50 商品 2023-10-28 17:12:18 +08:00
7da876c51e 便利店 2023-10-28 17:10:02 +08:00
92eafa75ec 便利店 2023-10-28 15:03:28 +08:00
217a549247 便利店 2023-10-28 13:33:42 +08:00
f8bf519927 便利店 2023-10-28 10:17:57 +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
38b2b16fce 收银台 2023-10-27 18:06:06 +08:00
afa7d57bef 便利店 2023-10-27 18:04:07 +08:00
99582ce083 收银台 2023-10-27 17:40:18 +08:00
d1991905d9 Merge remote-tracking branch 'origin/master' 2023-10-27 16:31:35 +08:00
93c1c6e04d 收银台 2023-10-27 16:31:27 +08:00
a7a60eb124 便利店 2023-10-27 16:29:53 +08:00
57f5d5489c 便利店 2023-10-27 10:49:09 +08:00
DESKTOP-369JRHT\12997
98a517e02b 便利店 2023-10-26 18:01:14 +08:00
f697d2bba8 便利店 2023-10-26 18:00:10 +08:00
2b6850b251 便利店 2023-10-26 16:02:04 +08:00
DESKTOP-369JRHT\12997
2af2037ed1 no message 2023-10-26 15:01:02 +08:00
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
19abf7e302 便利店 2023-10-26 11:04:48 +08:00
5040d2d9e1 收银台 2023-10-26 09:32:37 +08:00
76d4ace2eb 会员管理 固定等级 2023-10-25 18:20:42 +08:00