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

60 Commits

Author SHA1 Message Date
liguoyang
287c844d05 fix 查询优化 2024-03-24 21:55:14 +08:00
liguoyang
0eb099e7a1 fix 参数来源 2024-03-24 21:49:40 +08:00
liguoyang
f76d9212bc fix 显示当前factory,排序 2024-03-24 21:34:51 +08:00
liguoyang
7fafb8844c feat 根据code查询所有档案 2024-03-24 19:27:27 +08:00
liguoyang
3ea432943f Squashed commit of the following: 
commit afdd9e6f14
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:48:05 2024 +0800

    fix 价格默认获取菜单中的设置

commit a3cfc472c8
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:40:04 2024 +0800

    fix 时间范围逻辑

commit 83f8906f12
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:32:55 2024 +0800

    fix 时间范围逻辑

commit 35660b1d0c
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:29:36 2024 +0800

    fix 数据范围罗逻辑修改

commit 7407955bc5
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:14:06 2024 +0800

    fix 分类树增加营业点参数

commit ed5196d1a1
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 21:02:52 2024 +0800

    feat 用户创建

commit d25909a235
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:51:20 2024 +0800

    fix 菜单明细调整

commit 8915f9ff0f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:42:08 2024 +0800

    fix 判断提前

commit 45aa52aa2a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:34:22 2024 +0800

    fix 逻辑取反

commit 89904fead1
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 20:23:20 2024 +0800

    fix 菜单时效范围

commit 573911f907
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 19:13:33 2024 +0800

    fix 订单聚合返回状态

commit 93c38be18a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 18:40:12 2024 +0800

    fix 订单查询

commit e256d18d36
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 18:14:33 2024 +0800

    fix 订单取消接口,分页权限控制

commit 1218aec811
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 17:32:45 2024 +0800

    fix 营业点权限控制优化

commit 226c61ee41
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 17:09:42 2024 +0800

    fix tenantId赋值

commit 28d2c1d8d4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 17:05:37 2024 +0800

    fix ignoretenant

commit 5ae6dd97b4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:53:40 2024 +0800

    fix ignoretenant

commit 4c866eaf3f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:40:24 2024 +0800

    feat 获取所有地址

commit 2ca8f2db49
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:22:47 2024 +0800

    fix 优化查询

commit 212a1fa073
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 16:01:49 2024 +0800

    fix 临时数据模拟

commit 0eb76e878c
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 15:48:59 2024 +0800

    fix 处理删除缺少判断

commit c582fb40c0
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 15:40:22 2024 +0800

    fix 查询优化

commit 6d3a19b283
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:48:45 2024 +0800

    fix 错误值修改

commit c39f77008d
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:31:50 2024 +0800

    fix 营业点控制(admin),unit返回

commit a5dcab1d07
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:16:23 2024 +0800

    fix 营业点分页控制

commit 02084be82b
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 11:01:14 2024 +0800

    fix 分类控制菜品获取

commit 96c5c5feba
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 10:39:58 2024 +0800

    fix DI

commit 367ede2eeb
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Thu Mar 21 10:35:24 2024 +0800

    fix 订餐返回当前信息,增加数量入参和响应

commit 0e1f6cb4a0
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 16:40:10 2024 +0800

    fix 餐补查询代码调整

commit 21fc2f78d3
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 15:52:46 2024 +0800

    fix 支付批量操作

commit 878b44a146
Merge: a90d4e6 bf5c937
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 15:27:39 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit a90d4e66a7
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 15:27:37 2024 +0800

    fix 餐补查询及日志删除

commit bf5c937037
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 15:12:30 2024 +0800

    fix 补充营业点分配权限接口

commit 07672f1d32
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 13:56:33 2024 +0800

    fix 优化changeDb

commit 7090ee4a33
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 13:41:25 2024 +0800

    fix 敏感信息混淆

commit 4366b68831
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 12:42:48 2024 +0800

    fix 代码优化

commit 03b73515b5
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Mar 20 10:59:08 2024 +0800

    fix tree返回营业点

commit 1ce60bedc2
Merge: aba4fa7 2d83930
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 09:55:17 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit aba4fa7ee9
Author: cheche <717840555@qq.com>
Date:   Wed Mar 20 09:55:13 2024 +0800

    fix 删除日志优化

commit 2d8393068f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 20:53:16 2024 +0800

    feat 订单聚合接口

commit 0cde1d3d92
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 20:03:06 2024 +0800

    fix 表名称调整

commit f003e30169
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 19:51:56 2024 +0800

    fix 订餐null异常处理

commit f427338715
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 18:43:19 2024 +0800

    feat 获取菜品

commit 3a65d95701
Merge: 9a7091b 7432fae
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 18:36:16 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit 9a7091b4e0
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 18:36:14 2024 +0800

    fix 删除日志try

commit 7432fae103
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 18:02:31 2024 +0800

    fix 配送点增加

commit ecd162c7af
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 17:51:15 2024 +0800

    fix 预定就餐送货地点

commit 1c7a054ed4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 15:53:22 2024 +0800

    feat 获取所有营业点接口

commit 84398a566e
Merge: 217d9f7 84b4025
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 15:26:42 2024 +0800

    Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

commit 217d9f7770
Author: cheche <717840555@qq.com>
Date:   Tue Mar 19 15:26:40 2024 +0800

    feat  配送点管理

commit 84b402538e
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 14:59:21 2024 +0800

    fix 菜单分页响应调整,增加详情接口

commit 098d7c7e9d
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 14:26:24 2024 +0800

    fix 代码优化
 2024-03-21 22:04:52 +08:00
liguoyang
a3112eb256 Merge branch 'development' 2024-03-15 13:59:18 +08:00
cheche
d3a94a4d28 fix 解决合并冲突1 2024-03-14 17:21:46 +08:00
cheche
5be226aef2 fix 字段修改 2024-03-14 17:19:43 +08:00
liguoyang
d17b20365a fix 查询取消异常抛出 2024-03-14 15:46:08 +08:00
liguoyang
87a386a3d7 fix 入参取消Array 2024-03-13 20:17:48 +08:00
liguoyang
80aa3f6932 feat 数据迁移接口 2024-03-12 12:45:25 +08:00
cheche
7bf97dbe5e fix 根据档案号 设备组查询设备优化 2024-03-12 10:34:31 +08:00
cheche
5684078071 feat 获取用户所有设备权限 2024-03-11 18:37:42 +08:00
liguoyang
59122c408f fix 根据档案号,设备组查询设备 2024-03-11 18:04:00 +08:00
cheche
90e5728fd3 feat aa 2024-03-11 17:48:47 +08:00
liguoyang
fff0928a86 fix 调整用户对应营业点处理 2024-03-11 16:31:26 +08:00
cheche
17aef775c3 feat 根据用户查看餐饮点 2024-03-11 16:12:52 +08:00
liguoyang
d2385a3f4f fix 配置错误 2024-03-08 15:15:32 +08:00
liguoyang
14c63ead73 fix 优化查询判断 2024-03-06 21:40:34 +08:00
liguoyang
4c959ccd40 fix 代码优化 2024-03-05 19:36:13 +08:00
liguoyang
509662429b fix 移除无用接口 2024-03-05 17:06:12 +08:00
liguoyang
888460ea99 fix 框架tenant问题;档案组和设备组特殊处理返回 2024-03-05 16:45:15 +08:00
liguoyang
dd44750a97 fix 档案明细返回人脸base64 2024-02-27 18:25:31 +08:00
liguoyang
e61833fa81 feat 框架升级,代码整合 2024-02-27 18:15:46 +08:00
liguoyang
364deaf21e fix 接口修改为post 2024-02-27 17:30:57 +08:00
liguoyang
4efc708177 feat 换卡操作 2024-02-23 20:46:24 +08:00
liguoyang
7c52b7fb1e fix 路由名称重复 2024-02-23 14:13:04 +08:00
liguoyang
b272373584 fix 营业点餐次修改 2024-02-23 12:12:30 +08:00
liguoyang
e3710ad0a5 feat 批量上传人脸接口 2024-02-22 16:37:52 +08:00
liguoyang
f4acba8c6b fix 移除无用字段 2024-02-22 16:02:19 +08:00
liguoyang
170b6a1202 feat 创建系统默认分组 2024-02-22 14:30:03 +08:00
cheche
ef60f1dffc feat 获取本基地管理员列表 2024-02-21 14:59:23 +08:00
cheche
7f7afb251c fix 设备数据和人员数据修改 2024-02-21 11:44:55 +08:00
cheche
6e492595f8 feat 二级路由更改及设备人员数据 2024-02-21 11:09:38 +08:00
cheche
1f360c8005 feat 部门数分页 2024-02-20 11:07:04 +08:00
cheche
0b02a95f66 fix 档案详情 2024-01-30 14:53:31 +08:00
cheche
9673f173b2 feat 记录查询接口 2024-01-29 18:15:48 +08:00
liguoyang
e749a6cc14 fix 升级到0.5.2,优化任务生成 2024-01-22 09:45:39 +08:00
liguoyang
6480501a03 fix 补充注释 2024-01-19 13:30:52 +08:00
cheche
2000ea3a0e feat 批量获取人口post 2024-01-17 18:39:56 +08:00
cheche
c97daa2554 fix 批量人脸 2024-01-17 14:25:47 +08:00
cheche
ba9211ef9e fix 批量获取人脸 2024-01-17 14:10:30 +08:00
cheche
7aa2a071e0 feat 批量获取人脸照 2024-01-17 10:42:18 +08:00
liguoyang
01ec274031 feat 根据工号获取人脸链接 2024-01-15 16:53:41 +08:00
liguoyang
ea5761d9b4 fix 档案组,设备权限分配 2024-01-15 14:55:26 +08:00
liguoyang
79bc32c959 feat 设备任务领取 2024-01-13 20:53:04 +08:00
liguoyang
15e90d4d16 feat 人脸上传,内部支持客户端授权 2024-01-11 19:38:23 +08:00
liguoyang
8dba9e9a3a feat 获取当前人员信息 2024-01-10 14:51:38 +08:00
liguoyang
cd31e3fc58 fix 人事范围调用处理 2024-01-10 11:44:59 +08:00
cheche
2e6c30e305 fix 档案类型修正 2024-01-09 11:25:05 +08:00