|
|
5a437af90b
|
Merge remote-tracking branch 'origin/development' into development
|
2024-05-30 13:44:03 +08:00 |
|
Kurris
|
f16fdd2d04
|
fix 小数点控制
|
2024-05-30 13:41:51 +08:00 |
|
Kurris
|
496e3b5a04
|
fix 小数点控制
|
2024-05-27 13:46:37 +08:00 |
|
Kurris
|
5aaaa81353
|
fix 移除人员判断语句
|
2024-05-27 09:43:32 +08:00 |
|
Kurris
|
47cb34d4c6
|
fix 补充日志调试
|
2024-05-27 09:20:38 +08:00 |
|
Kurris
|
aa1a84a5a7
|
fix 减少获取同步数据
|
2024-05-27 09:08:02 +08:00 |
|
Kurris
|
9f5f1652ae
|
fix 表达式错误
|
2024-05-27 09:01:40 +08:00 |
|
Kurris
|
22c450519b
|
fix 表达式错误
|
2024-05-27 08:52:06 +08:00 |
|
Kurris
|
a39f792edd
|
fix 数据过滤调整
|
2024-05-25 01:53:59 +08:00 |
|
|
|
ee949358f6
|
fix 控制导入的权限
|
2024-05-24 15:41:55 +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 |
|
|
|
e0c9621e56
|
fix 用户列表查询问题
|
2024-05-24 15:11:17 +08:00 |
|
|
|
9be2a5ce04
|
fix 优化人员列表展示
|
2024-05-24 15:11:17 +08:00 |
|
|
|
1422d6836c
|
feat 获取出差信息
|
2024-05-24 15:11:17 +08:00 |
|
|
|
5383410b77
|
feat 餐补余额导入
|
2024-05-24 15:11:17 +08:00 |
|
|
|
af6ef69091
|
fix 设备方向,代码格式化
|
2024-05-24 15:11:17 +08:00 |
|
|
|
74cb452032
|
fix 访客预约优化
|
2024-05-24 15:10:39 +08:00 |
|
|
|
22c4f774d8
|
fix .
|
2024-05-24 15:10:39 +08:00 |
|
|
|
51a0ffe4f1
|
fix docker环境
|
2024-05-24 15:10:39 +08:00 |
|
|
|
06134de484
|
fix .
|
2024-05-24 15:10:39 +08:00 |
|
|
|
ee55665da1
|
fix 依赖
|
2024-05-24 15:10:39 +08:00 |
|
|
|
e17691d62d
|
fix 依赖
|
2024-05-24 15:10:39 +08:00 |
|
|
|
3e4fb791cd
|
fix 依赖问题
|
2024-05-24 15:10:39 +08:00 |
|
|
|
b4651bbb44
|
fix linux依赖问题
|
2024-05-24 15:10:39 +08:00 |
|
|
|
b41a257056
|
fix 路由前缀问题
|
2024-05-24 15:10:39 +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 |
|
|
|
75f9edb1fa
|
fix 用户列表查询问题
|
2024-05-23 14:45:41 +08:00 |
|
|
|
74a6b71a3a
|
fix 优化人员列表展示
|
2024-05-22 16:44:45 +08:00 |
|
|
|
8773c06c86
|
feat 获取出差信息
|
2024-05-22 16:39:55 +08:00 |
|
|
|
99aa2a71a2
|
feat 餐补余额导入
|
2024-05-22 16:39:08 +08:00 |
|
|
|
03f732c412
|
fix 设备方向,代码格式化
|
2024-05-21 17:09:54 +08:00 |
|
|
|
234a5d2984
|
fix 访客预约优化
|
2024-05-21 17:07:28 +08:00 |
|
|
|
56ac694d85
|
fix .
|
2024-05-09 11:24:20 +08:00 |
|
|
|
4e8f50b544
|
fix docker环境
|
2024-05-09 11:21:56 +08:00 |
|
|
|
4046d54b2a
|
fix .
|
2024-05-09 10:51:39 +08:00 |
|
|
|
f3dec0ccdf
|
fix 依赖
|
2024-05-07 18:50:33 +08:00 |
|
|
|
6b2978dc37
|
fix 依赖
|
2024-05-07 18:31:30 +08:00 |
|
|
|
98b7ec90be
|
fix 依赖问题
|
2024-05-07 18:10:43 +08:00 |
|
|
|
e5e1901143
|
fix linux依赖问题
|
2024-05-07 15:17:23 +08:00 |
|
|
|
49b6aa6e82
|
fix 路由前缀问题
|
2024-05-07 15:06:54 +08:00 |
|
|
|
cfb78c6bc9
|
Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development
|
2024-05-07 14:45:58 +08:00 |
|
|
|
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 |
|