Commit Graph

1078 Commits

Author SHA1 Message Date
DESKTOP-369JRHT\12997
9ea5b605ad 商品进货退货盘点货损 2023-10-31 17:55:49 +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
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
afa7d57bef 便利店 2023-10-27 18:04:07 +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
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
DESKTOP-369JRHT\12997
fe075eeb54 审核 2023-10-25 18:19:09 +08:00
b0b04f4349 处理 2023-10-25 14:40:20 +08:00
36687535b7 会员管理 固定等级 2023-10-25 13:17:49 +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
DESKTOP-369JRHT\12997
b3d5f153c9 审核 2023-10-24 19:07:56 +08:00
c19f1bbbb1 Merge remote-tracking branch 'origin/master' 2023-10-24 18:52:25 +08:00
8352210bfa 123 2023-10-24 18:52:17 +08:00
9cd211ed96 会员管理 固定等级 2023-10-24 18:51:29 +08:00
7e2c047e4d 会员管理 固定等级 2023-10-24 14:00:29 +08:00
DESKTOP-369JRHT\12997
f95867e000 修改 2023-10-23 18:25:27 +08:00
a28df63a64 会员管理 固定等级 2023-10-23 18:23:08 +08:00
18cbb90abd 10.17 16:57 2023-10-23 15:17:08 +08:00
fe0ec44dff 会员管理 2023-10-23 15:03:48 +08:00
DESKTOP-369JRHT\12997
69feab70bc 进油 盘点 2023-10-23 15:03:04 +08:00
3fd0db5a0d 会员管理 2023-10-20 18:42:38 +08:00
DESKTOP-369JRHT\12997
3738223f88 盘点 进油 2023-10-20 18:02:47 +08:00
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
4e88af4a80 处理 2023-10-19 17:32:43 +08:00
liujinfeng@rd.sdtwxx.com
1331e02754 提交便利店商品分类代码 2023-10-19 12:59:24 +08:00
c828a46a79 会员管理 2023-10-18 18:31:46 +08:00
DESKTOP-369JRHT\12997
b8398df156 供应商 进油 2023-10-18 18:18:15 +08:00
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
e0385816b3 会员管理 2023-10-16 18:04:58 +08:00
3f93a5fa53 Merge remote-tracking branch 'origin/master' 2023-10-16 17:44:31 +08:00
91448e7e2a 处理 2023-10-16 17:44:18 +08:00
DESKTOP-369JRHT\12997
754ee569be 修改 2023-10-14 18:03:23 +08:00
ad00a75e67 门店信息 2023-10-14 18:02:31 +08:00
DESKTOP-369JRHT\12997
e89ddfecab 油价 2023-10-13 18:14:19 +08:00
c63b6018a1 门店信息 2023-10-13 18:11:05 +08:00
c31d009ade 处理 2023-10-13 16:35:11 +08:00
5828f02c35 处理 2023-10-13 16:22:43 +08:00
f43d436015 门店信息 2023-10-12 18:50:33 +08:00
DESKTOP-369JRHT\12997
f9940568ac 油品管理 2023-10-12 18:44:46 +08:00
22a08f5e51 处理 2023-10-12 17:57:09 +08:00
326a5834be 员工管理 2023-10-12 15:49:06 +08:00
DESKTOP-369JRHT\12997
7906645557 油品类型 2023-10-12 13:47:06 +08:00
DESKTOP-369JRHT\12997
b365d25dc0 修改 2023-10-12 11:57:09 +08:00
e711be00e8 处理 2023-10-12 10:00:52 +08:00
DESKTOP-369JRHT\12997
2267d5a28f 修改 2023-10-12 09:59:39 +08:00
DESKTOP-369JRHT\12997
4eba955195 修改错误 2023-10-12 09:56:59 +08:00
DESKTOP-369JRHT\12997
0fdf41abb6 修改因提交代码时丢掉代码的错误 2023-10-12 09:45:20 +08:00
212e2d5cca 员工管理 2023-10-11 18:45:54 +08:00
DESKTOP-369JRHT\12997
676e322c12 油站管理-油类管理+趋势管理 2023-10-11 18:40:16 +08:00
c963066385 处理 2023-10-11 18:37:04 +08:00
ceddee9e85 处理 2023-10-11 13:22:16 +08:00
29f78ae021 员工管理 2023-10-10 18:58:08 +08:00
55ec1ac12c 处理打包后 配置文件丢失问题 2023-10-10 10:21:17 +08:00
ed2035cd52 处理 2023-10-10 09:09:01 +08:00
1437fa9ed7 init 2023-10-09 11:12:49 +08:00