Commit Graph

34 Commits

Author SHA1 Message Date
f1cb0813db feat 梯控相关 2026-03-13 15:42:36 +08:00
66df7b809b fix 数据绑定调整 2025-03-05 12:31:52 +08:00
8f370899e9 fix 处理已知问题 2025-01-16 14:44:51 +08:00
cce6785863 fix 已知问题 2024-10-10 12:28:20 +08:00
4cb7d419de fix 处理已知问题 2024-08-26 16:11:32 +08:00
4f7b984dfc feat 电子餐券 2024-08-16 21:48:28 +08:00
ba7821796b fix 获取设备支持多factory 2024-07-15 10:52:01 +08:00
38ab947790 fix 处理自动注册部署点为AUTO的名称 2024-07-02 14:27:02 +08:00
0452fca141 fix 调整创建人1 2024-06-14 11:30:00 +08:00
bd91787e92 fix 获取品牌设备增加factory字段 2024-06-13 14:49:41 +08:00
1ca13d09d2 fix 根据品牌获取设备 2024-06-12 17:38:05 +08:00
82a3994d4d fix 任务根据设备心跳状态获取 2024-06-12 12:11:41 +08:00
75bd31d4a5 feat 外包人员,框架升级 2024-05-30 19:37:27 +08:00
db094bc768 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
2024-05-24 15:16:44 +08:00
a845daf559 fix 默认参数问题 2024-05-24 15:15:47 +08:00
af6ef69091 fix 设备方向,代码格式化 2024-05-24 15:11:17 +08:00
d056acf52e fix 注册设备默认信息 2024-05-24 15:01:25 +08:00
9cc880253c fix 数据添加有误处理,展示排序 2024-05-24 14:37:03 +08:00
03f732c412 fix 设备方向,代码格式化 2024-05-21 17:09:54 +08:00
922ed7211d fix 命名修改 2024-05-07 14:45:56 +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
97dc2c9b7a fix 处理已知问题 2024-04-16 14:50:43 +08:00
58cf67cbc1 add 补充文件 2024-04-01 11:15:45 +08:00
e04954f471 feat 租户添加 2024-02-23 16:59:53 +08:00
f255a87138 fix 框架调整,优化数据返回 2024-02-23 16:20:24 +08:00
b272373584 fix 营业点餐次修改 2024-02-23 12:12:30 +08:00
54510f28ea fix 移除brand字段 2024-01-25 14:43:21 +08:00
e749a6cc14 fix 升级到0.5.2,优化任务生成 2024-01-22 09:45:39 +08:00
46b0965fd9 fix 基础字段处理 2024-01-10 17:37:54 +08:00
54835e6cae fix 设备注册自动新增 2024-01-10 17:33:27 +08:00
5915264df9 fix 设备对接接口忽略tenant 2024-01-10 16:53:47 +08:00
b341a59359 fix 调整无授权处理,增加检查设备是否存在接口 2024-01-08 11:36:10 +08:00
bcec08d10a fix 补充注释,接口兼容设备 2024-01-03 17:34:19 +08:00
d7cf07d940 feat 设备连接注册,sap人事范围,部门 2023-12-28 16:04:00 +08:00