211 Commits

Author	SHA1	Message	Date
wangh	f706797001	bug修改	2023-11-24 17:59:53 +08:00
齐天大圣	87147fbcf3	Merge remote-tracking branch 'origin/master'	2023-11-24 17:24:20 +08:00
齐天大圣	92d425f57c	手机验证码登录	2023-11-24 17:24:10 +08:00
wangh	7e8e0fac03	修改	2023-11-24 10:23:59 +08:00
cun-nan	302a7850fe	收银台	2023-11-23 18:37:40 +08:00
wangh	d68f87b29b	bug修改	2023-11-23 18:33:25 +08:00
cun-nan	58db28edfb	收银台	2023-11-22 18:10:36 +08:00
wangh	b2574cc2cb	会员等级和进油修改	2023-11-22 18:05:02 +08:00
齐天大圣	f6a9d94364	Merge remote-tracking branch 'origin/master'	2023-11-22 13:40:06 +08:00
齐天大圣	9da6684bf0	修改Bug	2023-11-22 13:39:57 +08:00
wangh	19f521c406	修改bug	2023-11-22 10:53:41 +08:00
齐天大圣	efaf87cb3e	Merge remote-tracking branch 'origin/master'	2023-11-22 10:47:32 +08:00
齐天大圣	916383fe82	修改Bug	2023-11-22 10:47:20 +08:00
wangh	b51938071a	Merge branch 'master' of https://gitee.com/nny_1/oilSystem	2023-11-21 18:12:04 +08:00
wangh	174bfee9d5	bug修改	2023-11-21 18:11:49 +08:00
齐天大圣	92251e2556	Merge remote-tracking branch 'origin/master'	2023-11-21 14:30:06 +08:00
齐天大圣	3eec70da9b	修改Bug	2023-11-21 14:29:55 +08:00
cun-nan	92f6691025	收银台	2023-11-21 11:00:14 +08:00
齐天大圣	3c916cb22b	Merge remote-tracking branch 'origin/master'	2023-11-21 09:45:37 +08:00
齐天大圣	4293d06417	兑换优惠券	2023-11-21 09:45:28 +08:00
cun-nan	7ec55c0386	收银台	2023-11-20 19:53:05 +08:00
cun-nan	5568c13c04	收银台	2023-11-20 14:27:22 +08:00
齐天大圣	40afd862da	Merge remote-tracking branch 'origin/master'	2023-11-20 09:22:30 +08:00
齐天大圣	61fd49e3c4	满减优惠券	2023-11-20 09:22:14 +08:00
wangh	516f80e57b	收银台	2023-11-17 16:38:17 +08:00
cun-nan	b9b49fcb62	收银台	2023-11-17 16:33:36 +08:00
齐天大圣	435e6feb10	会员等级	2023-11-17 15:39:55 +08:00
齐天大圣	88053d1a20	修改会员等级	2023-11-17 15:21:40 +08:00
齐天大圣	40c0b630e2	Merge remote-tracking branch 'origin/master'	2023-11-17 13:09:40 +08:00
齐天大圣	9fee58ebd7	修改卡券Bug	2023-11-17 13:09:28 +08:00
wangh	478e6fc8f8	Merge branch 'master' of https://gitee.com/nny_1/oilSystem	2023-11-17 11:14:45 +08:00
wangh	de70f12c56	油枪	2023-11-17 11:14:36 +08:00
cun-nan	6f1406f8c6	收银台	2023-11-16 19:00:57 +08:00
wangh	4ef7e1cdca	Merge branch 'master' of https://gitee.com/nny_1/oilSystem ... # Conflicts: # fuintCashierWeb/.env.development	2023-11-16 18:42:37 +08:00
wangh	b1329a0dcc	积分兑换	2023-11-16 18:40:50 +08:00
齐天大圣	b9f4fad30f	卡券核销	2023-11-16 18:31:29 +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
cun-nan	5bafce40c5	收银台	2023-11-15 18:48:07 +08:00
齐天大圣	1c320b17c1	折扣营销	2023-11-15 18:26:05 +08:00
齐天大圣	88e9ba8bc9	Merge remote-tracking branch 'origin/master'	2023-11-15 14:34:45 +08:00
齐天大圣	925c8cc402	修改消费有礼bug	2023-11-15 14:34:34 +08:00
cun-nan	757d9c5adb	收银台	2023-11-14 19:00:25 +08:00
wangh	9fb78cf532	积分	2023-11-14 18:53:58 +08:00
齐天大圣	684598000e	Merge remote-tracking branch 'origin/master'	2023-11-14 11:20:29 +08:00
齐天大圣	9d79c997a6	营销活动	2023-11-14 11:20:08 +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	70e1dc3d3d	余额充值	2023-11-13 16:53:12 +08:00
cun-nan	c06e8b1c59	收银台	2023-11-13 16:51:57 +08:00
cun-nan	c31617ed7f	收银台	2023-11-13 16:51:38 +08:00
cun-nan	79134699fd	收银台	2023-11-11 18:04:49 +08:00
wangh	5d67b7cbb3	充值	2023-11-11 18:02:25 +08:00
cun-nan	c9c66c61dd	收银台	2023-11-11 13:54:24 +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
cun-nan	79cded741a	收银台	2023-11-09 18:52:12 +08:00
DESKTOP-369JRHT\12997	46e0745947	积分设置	2023-11-09 18:31:36 +08:00
齐天大圣	d1e5ca4140	修改优惠券id	2023-11-09 13:53:03 +08:00
cun-nan	a3f8c672f1	收银台	2023-11-09 13:51:57 +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
齐天大圣	243041ced9	修改优惠券	2023-11-08 17:08:06 +08:00
cun-nan	67e94f78a8	收银台	2023-11-07 18:12:17 +08:00
DESKTOP-369JRHT\12997	96497a7be9	积分订单	2023-11-07 18:04:43 +08:00
齐天大圣	630f95dfb0	优惠券	2023-11-07 17:34:56 +08:00
齐天大圣	a80d0af65e	Merge remote-tracking branch 'origin/master'	2023-11-07 09:04:17 +08:00
齐天大圣	d8e82d2bb8	兑换券	2023-11-07 09:04:02 +08:00
cun-nan	17661f6115	收银台	2023-11-06 18:06:29 +08:00
DESKTOP-369JRHT\12997	092ce688cc	积分商品	2023-11-06 17:52:12 +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
齐天大圣	3c0078066e	油卡活动进度	2023-11-03 15:46:41 +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
齐天大圣	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
cun-nan	906b804b2b	便利店	2023-10-31 18:18:30 +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	189d0533ee	商品货损	2023-10-30 18:09:11 +08:00
cun-nan	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
cun-nan	7da876c51e	便利店	2023-10-28 17:10:02 +08:00
cun-nan	92eafa75ec	便利店	2023-10-28 15:03:28 +08:00
cun-nan	217a549247	便利店	2023-10-28 13:33:42 +08:00
cun-nan	f8bf519927	便利店	2023-10-28 10:17:57 +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