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

36 Commits

Author SHA1 Message Date
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
b51b93f273 fix 优化数据问题 2024-04-16 12:36:21 +08:00
cheche
ff15ae9176 feat 设备批量导入 2024-03-07 16:45:31 +08:00
liguoyang
64fbe4737d fix AbleSetNext值映射 2024-03-06 19:30:47 +08:00
liguoyang
8157f0a01b fix 优化分组 2024-03-05 20:38:00 +08:00
liguoyang
4c959ccd40 fix 代码优化 2024-03-05 19:36:13 +08:00
cheche
af4a8839b7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-05 16:58:50 +08:00
cheche
ae29ddee87 fix 修改营业点分页模糊搜索条件 2024-03-05 16:58:46 +08:00
liguoyang
888460ea99 fix 框架tenant问题;档案组和设备组特殊处理返回 2024-03-05 16:45:15 +08:00
cheche
3de3fde888 fix 修改设备对应营业点 2024-03-05 15:45:21 +08:00
cheche
80088df845 fix 移动api日志位置 2024-03-01 13:51:26 +08:00
liguoyang
3bf049a51e fix 优化apilog和设备上传log 2024-02-26 16:17:59 +08:00
liguoyang
9b8acdb477 fix 枚举修改报错 2024-02-23 17:04:33 +08:00
liguoyang
4ee5703b65 fix 就餐增加权限控制 2024-02-22 18:12:28 +08:00
liguoyang
0143b2aba1 fix 优化调整 2024-02-22 17:53:06 +08:00
liguoyang
4bd0c2403d fix 设备组数据展示,保存控制editable 2024-02-22 17:43:33 +08:00
liguoyang
82f942ed13 fix role,user查看; 设备状态 2024-02-22 15:32:24 +08:00
liguoyang
a08b08fbc1 fix 设备,设备分组调整 2024-02-22 15:00:51 +08:00
cheche
b5d6ec8366 feat 查询消费机总数、离线设备数量、营业点数量、可消费人数、人均日消费额 2024-02-22 14:04:01 +08:00
cheche
6d2d62d628 feat 获取api日志 2024-02-22 10:12:04 +08:00
cheche
ef60f1dffc feat 获取本基地管理员列表 2024-02-21 14:59:23 +08:00
liguoyang
28871aa450 fix 功能调整 2024-02-01 17:46:40 +08:00
cheche
2f5f6be7d7 fix 设备分页返回属性新增Type 2024-02-01 10:17:43 +08:00
cheche
b1927ef9ca fix 设备/组新城枚举及调整 2024-01-31 17:32:00 +08:00
cheche
9673f173b2 feat 记录查询接口 2024-01-29 18:15:48 +08:00
liguoyang
e669134fea fix 单独的设备分页类型 2024-01-25 14:29:33 +08:00
liguoyang
51c80a242e fix 调试大华设备对接 2024-01-24 20:46:55 +08:00
liguoyang
01ec274031 feat 根据工号获取人脸链接 2024-01-15 16:53:41 +08:00
liguoyang
7c242370fc fix 注释,下发任务状态分页 2024-01-10 16:13:24 +08:00
liguoyang
76558e2f0a feat 升级版本, 设备权限 2024-01-10 11:06:15 +08:00
liguoyang
ba87dc6c86 fix func字段处理 2024-01-05 12:29:29 +08:00
liguoyang
a8a535153a fix 餐饮订单参数控制,设备组参数返回 2024-01-04 19:47:31 +08:00
liguoyang
bcec08d10a fix 补充注释,接口兼容设备 2024-01-03 17:34:19 +08:00
liguoyang
74d8bd7b3f feat 设备分组 2023-12-29 10:09:51 +08:00
liguoyang
d7cf07d940 feat 设备连接注册,sap人事范围,部门 2023-12-28 16:04:00 +08:00
liguoyang
da09dd9f0f init 项目代码初始化 2023-12-25 11:01:55 +08:00