yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,460 Commits 2 Branches 0 Tags
5f3e28c94de89623c5da52a14f4adda933d3cdcf
Commit Graph

295 Commits

Author SHA1 Message Date
liguoyang
a545f46d27 fix 控制不可按role分配权限 2024-06-14 12:17:21 +08:00
liguoyang
0452fca141 fix 调整创建人1 2024-06-14 11:30:00 +08:00
liguoyang
b9b96f1bfc fix 用户同步和设备ignoreTenant 2024-06-14 10:17:14 +08:00
liguoyang
bd91787e92 fix 获取品牌设备增加factory字段 2024-06-13 14:49:41 +08:00
liguoyang
15c67a4f78 fix 增加部门名称,数据权限控制 2024-06-13 14:26:46 +08:00
liguoyang
1ca13d09d2 fix 根据品牌获取设备 2024-06-12 17:38:05 +08:00
liguoyang
1975e37294 fix 补充缺少字段 2024-06-12 12:17:55 +08:00
liguoyang
e609537a6e feat 按设备,设备组,营业点维度添加人员 2024-06-12 12:17:55 +08:00
liguoyang
7c33bf8aba fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:17:55 +08:00
liguoyang
7f7b759840 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:17:55 +08:00
liguoyang
69f09a6600 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:17:55 +08:00
liguoyang
6827982506 feat 按设备,设备组,营业点维度添加人员 2024-06-12 12:17:40 +08:00
liguoyang
d200a1626b fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:16:24 +08:00
liguoyang
34bb546d8a fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:13:29 +08:00
liguoyang
fc15d50fc2 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:12:33 +08:00
liguoyang
f1aaf6177a feat 按设备,设备组,营业点维度添加人员 2024-06-12 12:11:42 +08:00
liguoyang
926f5bf4d6 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:42 +08:00
liguoyang
6777224f1d fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
liguoyang
d4ba1a7a0a fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
liguoyang
02e3e5c63b feat 按设备,设备组,营业点维度添加人员 2024-06-12 12:11:41 +08:00
liguoyang
82a3994d4d fix 任务根据设备心跳状态获取 2024-06-12 12:11:41 +08:00
liguoyang
0a7898cd73 fix 设备组重组 2024-06-12 12:11:41 +08:00
liguoyang
9b359cc283 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
liguoyang
f27d044c1d fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
liguoyang
a052e77e53 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
liguoyang
d8d14610e9 fix 优化代码风格和触发数据迁移任务下发 2024-06-09 00:19:12 +08:00
liguoyang
9d1d069450 fix 餐补人员显示离职人员,分配权限增加锁 2024-06-07 12:11:32 +08:00
liguoyang
c978e773b2 fix 分配处理临时恢复 2024-06-06 17:28:44 +08:00
liguoyang
895524e6c7 fix 代码优化 2024-05-31 19:34:35 +08:00
liguoyang
8778e5ad84 fix version 2024-05-31 17:52:23 +08:00
liguoyang
abe6a52ee1 fix 移除无用代码 2024-05-31 16:04:41 +08:00
liguoyang
7f14b1fdc5 fix 优化任务分配速度 2024-05-30 23:01:21 +08:00
liguoyang
5c30638274 fix 优化datetime格式 2024-05-30 20:44:41 +08:00
liguoyang
75bd31d4a5 feat 外包人员,框架升级 2024-05-30 19:37:27 +08:00
liguoyang
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
liguoyang
a845daf559 fix 默认参数问题 2024-05-24 15:15:47 +08:00
liguoyang
0751415a22 fix 是否作为考勤分页返回 2024-05-24 15:11:17 +08:00
liguoyang
af6ef69091 fix 设备方向,代码格式化 2024-05-24 15:11:17 +08:00
liguoyang
d056acf52e fix 注册设备默认信息 2024-05-24 15:01:25 +08:00
liguoyang
9cc880253c fix 数据添加有误处理,展示排序 2024-05-24 14:37:03 +08:00
liguoyang
3d3d17c799 fix 是否作为考勤分页返回 2024-05-23 14:49:00 +08:00
liguoyang
03f732c412 fix 设备方向,代码格式化 2024-05-21 17:09:54 +08:00
liguoyang
922ed7211d fix 命名修改 2024-05-07 14:45:56 +08:00
liguoyang
b5c6551783 fix 代码优化 2024-05-07 14:45:56 +08:00
liguoyang
cc273a4693 fix 离线显示,优化enable获取设备,优化设备查询营业日期 2024-04-23 11:35:35 +08:00
liguoyang
c027b59d5d fix 处理分页值问题 2024-04-22 14:26:54 +08:00
liguoyang
089f020110 fix 优化代码 2024-04-22 14:09:58 +08:00
liguoyang
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
liguoyang
97dc2c9b7a fix 处理已知问题 2024-04-16 14:50:43 +08:00
liguoyang
b51b93f273 fix 优化数据问题 2024-04-16 12:36:21 +08:00