Commit Graph

467 Commits

Author SHA1 Message Date
662bd2e245 feat 员工消费二维码 2024-06-05 17:51:03 +08:00
582393e45d fix 并发执行问题,保密人员余额迁移 2024-06-04 21:38:12 +08:00
d11d6f5904 fix 临时移除 2024-05-31 20:23:18 +08:00
895524e6c7 fix 代码优化 2024-05-31 19:34:35 +08:00
8778e5ad84 fix version 2024-05-31 17:52:23 +08:00
fb7bd33098 fix 补充入离日期 2024-05-31 16:09:02 +08:00
abe6a52ee1 fix 移除无用代码 2024-05-31 16:04:41 +08:00
fc0da62986 feat 获取额外信息 2024-05-31 16:04:05 +08:00
7f14b1fdc5 fix 优化任务分配速度 2024-05-30 23:01:21 +08:00
5c30638274 fix 优化datetime格式 2024-05-30 20:44:41 +08:00
75bd31d4a5 feat 外包人员,框架升级 2024-05-30 19:37:27 +08:00
7e2c0c7e39 fix 外包人员,餐补导入,人员列表 2024-05-24 15:28:31 +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
0751415a22 fix 是否作为考勤分页返回 2024-05-24 15:11:17 +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
c3b69fbf24 fix 数据问题 2024-05-24 12:07:30 +08:00
3d3d17c799 fix 是否作为考勤分页返回 2024-05-23 14:49:00 +08:00
03f732c412 fix 设备方向,代码格式化 2024-05-21 17:09:54 +08:00
922ed7211d fix 命名修改 2024-05-07 14:45:56 +08:00
b5c6551783 fix 代码优化 2024-05-07 14:45:56 +08:00
cc273a4693 fix 离线显示,优化enable获取设备,优化设备查询营业日期 2024-04-23 11:35:35 +08:00
c027b59d5d fix 处理分页值问题 2024-04-22 14:26:54 +08:00
089f020110 fix 优化代码 2024-04-22 14:09:58 +08:00
df24e24e75 fix 身份证匹配 2024-04-20 15:29:52 +08:00
8005a4e89e fix 外部人员上传照片 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
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
2d2eb9dc49 fix 餐别显示 2024-04-16 15:18:23 +08:00
7731e8bb2c fix 调试代码移除 2024-04-16 15:10:29 +08:00
97dc2c9b7a fix 处理已知问题 2024-04-16 14:50:43 +08:00
b51b93f273 fix 优化数据问题 2024-04-16 12:36:21 +08:00
cc32e1d961 fix redis配置 2024-04-16 11:13:41 +08:00
9300f6545d feat 外部人员上传人脸 2024-04-15 17:01:23 +08:00
48bb170272 fix 获取档案失败自动发起同步任务 2024-04-15 17:01:09 +08:00
858b5a93f4 fix 离职任务生成调整 2024-04-14 11:05:13 +08:00
c8253bb083 fix 修复response写入问题,禁用设备导入 2024-04-13 09:31:22 +08:00
1d1a241ad4 fix 移除tenantId筛选 2024-04-11 13:17:02 +08:00
1fdfec7799 fix 设备保存全局校验 2024-04-10 14:33:42 +08:00
335a1211fb fix 查询优化 2024-04-10 13:11:23 +08:00
ce4a3409e9 fix 优化任务,增加设备类型 2024-04-09 22:46:30 +08:00
d257df697f fix 餐次段编辑赋值 2024-04-09 17:36:28 +08:00
22208fc1d9 fix 确保null异常和write response问题 2024-04-09 15:54:55 +08:00
475db1d433 fix 框架升级 2024-04-09 15:53:49 +08:00
bcbddb95b4 fix IgnoreDataCase 2024-04-08 15:46:42 +08:00
ec09c5ba9f fix 离职id处理 2024-04-07 21:56:02 +08:00
c3749ab5fc fix 下发任务数据补充 2024-04-07 21:19:29 +08:00