Commit Graph

1101 Commits

Author SHA1 Message Date
ca425fd067 feat 检测 2024-05-07 14:45:56 +08:00
922ed7211d fix 命名修改 2024-05-07 14:45:56 +08:00
46450cc15b fix role=admin移除 2024-05-07 14:45:56 +08:00
004dc6268f fix 必须分配基地 2024-05-07 14:45:56 +08:00
b5c6551783 fix 代码优化 2024-05-07 14:45:56 +08:00
9bdd39acbe feat 用户基地配置 2024-05-07 14:45:56 +08:00
2380dc9c79 fix 权限递归获取 2024-05-07 14:45:56 +08:00
ffa0311cc3 fix 菜单获取递归处理 2024-05-07 14:45:56 +08:00
f2e619028c feat 检测 2024-05-07 14:45:48 +08:00
aaf43f7540 fix 命名修改 2024-05-07 12:54:39 +08:00
dfaa35e487 fix role=admin移除 2024-05-06 17:20:26 +08:00
44e0ddca35 fix 必须分配基地 2024-04-28 11:26:23 +08:00
339236c79f fix 代码优化 2024-04-28 11:16:23 +08:00
a248920f83 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-04-28 11:13:58 +08:00
74843a1677 feat 用户基地配置 2024-04-28 11:11:04 +08:00
2c17f38c5e fix 权限递归获取 2024-04-28 10:46:45 +08:00
62596ee61d fix 菜单获取递归处理 2024-04-28 10:46:45 +08:00
c03fd748a3 fix 营业日期查询 2024-04-25 11:42:29 +08:00
f112ef3160 fix 权限递归获取 2024-04-24 22:32:26 +08:00
dea3361a93 fix 菜单获取递归处理 2024-04-24 22:16:20 +08:00
9885c8d9ae feat 组织架构 2024-04-23 19:10:23 +08:00
cc273a4693 fix 离线显示,优化enable获取设备,优化设备查询营业日期 2024-04-23 11:35:35 +08:00
350b78efef fix 用餐分析日期倒序 2024-04-22 16:13:16 +08:00
02bc171feb fix 分组处理 2024-04-22 15:11:27 +08:00
c027b59d5d fix 处理分页值问题 2024-04-22 14:26:54 +08:00
089f020110 fix 优化代码 2024-04-22 14:09:58 +08:00
9f9e80061f fix 成本日期问题 2024-04-22 13:22:20 +08:00
dac893de02 fix 日期问题 2024-04-22 13:14:32 +08:00
71fa1df4eb fix shiftcode为null 2024-04-22 13:04:28 +08:00
976506b355 fix 尝试清洗数据 2024-04-22 12:39:19 +08:00
e6071b47f1 fix 获取日志最后一条处理 2024-04-21 09:39:14 +08:00
fa8ffb5cf6 fix 字典获取值问题 2024-04-21 09:35:09 +08:00
d5fcc5b7fd fix 匹配餐次问题 2024-04-20 15:44:05 +08:00
b3b1952ba0 fix 恢复注释代码 2024-04-20 15:37:08 +08:00
66367ec4f4 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-04-20 15:31:14 +08:00
5746f93f8e fix 修改为分配设备 2024-04-20 15:30:27 +08:00
99ca6696c7 fix 消费统计 2024-04-20 15:30:27 +08:00
df24e24e75 fix 身份证匹配 2024-04-20 15:29:52 +08:00
8005a4e89e fix 外部人员上传照片 2024-04-20 15:29:52 +08:00
c7d6991521 fix redis配置 2024-04-20 15:29:52 +08:00
7721dc22a4 fix 人脸接口代码调整 2024-04-20 15:29:52 +08:00
39dbdf7d38 fix idno加密 2024-04-20 15:29:52 +08:00
81c4fdabbc feat 新增服务 2024-04-20 15:29:52 +08:00
3e4c5cc86b add dockerfile 2024-04-20 15:29:52 +08:00
f8d1997ddd Squashed commit of the following:
commit 528cdd51c05d26437f0b23f415e06311b667e9f7
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Apr 17 15:37:30 2024 +0800

    feat 访客预约

commit e73a3fcd9307f86aba2c39578495c03cde1d41f9
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Apr 16 16:15:16 2024 +0800

    feat 业务curd

commit b98b6e2764fea875866e11f790f388ccf3c234b5
Merge: a3dcec3 965e84b
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Apr 16 14:56:30 2024 +0800

    Merge branch 'feat-visitorAppointments' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-visitorAppointments

commit a3dcec30e1289fbb09de8f85009d3931d971337a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit 766fbec0c45a3852a75a7a37686b885ac3b0a77a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit 86731d41fee97ba073065ed1b807987760a371a7
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Sun Apr 14 20:11:56 2024 +0800

    fix 测试websocket链接

commit 1301b126a9ba9a7d97cf45967cf2915e1169c505
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit 081f3a67896c67891c3f80edde82a440b8736851
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit 271b6c5898b5732a35ccfa0629ce89442ac49143
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:34:26 2024 +0800

    test 提交测试代码

commit 965e84b6f3b7f925f8021c9b996cce961b896dea
Merge: 578eb6a 6a6fad1
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Mon Apr 15 17:06:45 2024 +0800

    Merge branch 'feat-visitorAppointments' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-visitorAppointments

commit 578eb6afbd96f0bfe4aaf8058fd4743309c74d62
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Sun Apr 14 20:11:56 2024 +0800

    fix 测试websocket链接

commit 114511f1daea64b7dbf9c3c38b73e28b6d0301e6
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit 5eacfa8af8087eade8553266a12a2cf42305716b
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit b2ffff1f099be343d89690014d05cb859776acbb
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:34:26 2024 +0800

    test 提交测试代码

commit 6a6fad1d1b8772eebf5df12cd74cfd5c955ff560
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Sun Apr 14 20:11:56 2024 +0800

    fix 测试websocket链接

commit 9ce3c4d6f63957c175d65370d9a6b80e10f4254f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit c637fd89850cf289d7da457c6c6f47354b5beed3
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit 58c39815b1c45a99aea0caf503fcb1365c957f03
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:34:26 2024 +0800

    test 提交测试代码
2024-04-20 15:29:52 +08:00
4b6d29291f fix dir 2024-04-20 15:29:52 +08:00
125aae476b fix 修改为分配设备 2024-04-19 17:27:49 +08:00
5888684c15 fix 消费统计 2024-04-19 17:06:51 +08:00
a2c121eadc fix 时间变更,在线订单转离线情况 2024-04-19 16:10:18 +08:00
8df7f8f419 fix 隐藏admin用户 2024-04-19 12:24:07 +08:00