Commit Graph

976 Commits

Author SHA1 Message Date
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
0987771686 fix 控制admin问题 2024-04-19 12:21:21 +08:00
c5cb85facd fix admin控制 2024-04-19 12:14:33 +08:00
c4393d46ce fix 补充werks记录 2024-04-18 16:22:14 +08:00
8400a992fc fix werks数据记录 2024-04-18 16:15:20 +08:00
de58369b1c fix 身份证匹配 2024-04-18 15:06:27 +08:00
5426a21449 fix 外部人员上传照片 2024-04-18 15:03:41 +08:00
de37fc8bec fix redis配置 2024-04-18 14:34:58 +08:00
708d28c849 fix 人脸接口代码调整 2024-04-17 18:14:34 +08:00
36546d71c1 fix 时间范围 2024-04-17 17:49:32 +08:00
0387689ad5 fix 增加userno提升速度 2024-04-17 17:37:09 +08:00
e8994e44c9 fix 注释 2024-04-17 17:31:03 +08:00
b5a817af18 fix idno加密 2024-04-17 16:42:05 +08:00
4770733b26 feat 新增服务 2024-04-17 15:49:25 +08:00
0d137dd7b5 add dockerfile 2024-04-17 15:41:35 +08:00
1276c53305 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-17 15:38:25 +08:00
54373131d6 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-04-17 15:37:50 +08:00
baa1439e91 fix dir 2024-04-17 15:37:48 +08:00
581294237c fix 数据问题处理 2024-04-16 19:38:54 +08:00
8fb18ef1c6 fix 角色分配 2024-04-16 15:59:37 +08:00
2d2eb9dc49 fix 餐别显示 2024-04-16 15:18:23 +08:00
7731e8bb2c fix 调试代码移除 2024-04-16 15:10:29 +08:00
d0dc4425fe Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-04-16 14:51:19 +08:00
a24b3a0294 fix dir 2024-04-16 14:51:07 +08:00
97dc2c9b7a fix 处理已知问题 2024-04-16 14:50:43 +08:00
b51b93f273 fix 优化数据问题 2024-04-16 12:36:21 +08:00