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

181 Commits

Author SHA1 Message Date
cheche
2ac842869c feat 配送点管理 2024-03-23 00:22:50 +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
liguoyang
8a0eb06038 fix 支持多选 2024-03-15 12:15:50 +08:00
liguoyang
ccf8a88a9b fix 调整为调度执行 2024-03-14 21:59:32 +08:00
liguoyang
9fdb2b0159 fix 移除无效字段返回 2024-03-14 21:44:02 +08:00
liguoyang
89a93d2a69 fix 同步人员控制人事范围 2024-03-14 18:44:04 +08:00
liguoyang
16be030748 feat 餐补接收 2024-03-14 16:35:38 +08:00
liguoyang
3e1827d5a1 fix log format 2024-03-13 20:15:53 +08:00
liguoyang
8998dd0789 fix 注销任务 2024-03-13 19:18:33 +08:00
liguoyang
d7103c8269 fix 更新密码 2024-03-13 18:14:16 +08:00
liguoyang
73cc592cd3 fix 成本中心 2024-03-12 12:28:48 +08:00
cheche
15f89a82a2 fix 字段优化 2024-03-12 09:24:53 +08:00
liguoyang
fff0928a86 fix 调整用户对应营业点处理 2024-03-11 16:31:26 +08:00
cheche
400ea0152c 考勤-记录查询，列表字段修改 2024-03-11 11:47:59 +08:00
liguoyang
bacadbe014 Merge branch 'master' into development 2024-03-11 11:36:21 +08:00
cheche
3b4b837994 fix 金额变正新增设备名称 2024-03-11 10:31:59 +08:00
liguoyang
c4bb884d48 fix job 2024-03-10 16:19:09 +08:00
liguoyang
41a956f1f6 fix 设备记录上传分页type区分 2024-03-10 11:57:48 +08:00
liguoyang
64a63e2e49 feat 同步账号 2024-03-10 00:55:51 +08:00
liguoyang
72ad6e7d23 fix job 2024-03-09 20:13:49 +08:00
liguoyang
7ef1434cff fix 人员更新获取code 2024-03-09 19:37:31 +08:00
liguoyang
33327718d9 fix 设备上传记录类型 2024-03-09 19:15:00 +08:00
liguoyang
500a972b70 fix job 2024-03-09 18:39:43 +08:00
liguoyang
3fb820bd2d fix 人员同步,下发任务创建 2024-03-09 18:03:33 +08:00
liguoyang
3bf767281e fix 上传记录使用工号 2024-03-09 16:00:09 +08:00
liguoyang
ee451d25c7 fix 配置文件key 2024-03-09 15:09:11 +08:00
liguoyang
d9e9856eab fix job 2024-03-09 15:04:31 +08:00
liguoyang
e5a0df385d fix 匹配失败获取中文 2024-03-09 14:28:29 +08:00
liguoyang
fa408bdcab fix 优化考勤上传 2024-03-09 13:53:12 +08:00
liguoyang
f9a7152c2b fix 优化考勤记录上传 2024-03-09 13:17:40 +08:00
liguoyang
553332e204 fix 集成job 2024-03-09 12:18:35 +08:00
liguoyang
bbd7659320 fix 同步任务调整 2024-03-09 12:13:11 +08:00
liguoyang
96ed9e04ef fix tenantId null 问题 2024-03-08 17:07:07 +08:00
liguoyang
23cc2588a3 fix rebase配置问题 2024-03-08 16:48:32 +08:00
liguoyang
27663b4e53 fix 数据类型调整 2024-03-08 16:42:22 +08:00
liguoyang
2d731e49c4 Merge branch 'development' 2024-03-08 11:31:56 +08:00
liguoyang
538fe7c4b4 fix 优化档案查询 2024-03-07 21:34:04 +08:00
liguoyang
990fc247bc fix type修改为设备类型 2024-03-07 17:26:46 +08:00
cheche
a1aa61b251 fix 设备任务分页优化 2024-03-07 10:51:28 +08:00
liguoyang
a0505a1a93 fix 根据权限查询 2024-03-07 00:31:27 +08:00
liguoyang
9f771bc865 fix 优化细节和tenant问题 2024-03-06 19:22:14 +08:00
liguoyang
8157f0a01b fix 优化分组 2024-03-05 20:38:00 +08:00
liguoyang
eada9b6af9 feat 任务状态重置 2024-03-05 20:09:55 +08:00
liguoyang
4c959ccd40 fix 代码优化 2024-03-05 19:36:13 +08:00
liguoyang
49dcf96bfc add 补充 2024-03-05 16:45:30 +08:00
liguoyang
c696f65481 fix 增加PCode条件 2024-03-05 15:53:40 +08:00
liguoyang
817eb9115a fix 系统分组生成调整 2024-03-05 15:29:25 +08:00
liguoyang
fde0c2394e fix 优化细节 2024-03-05 10:03:47 +08:00
liguoyang
83d5e4f166 fix 分页倒排 2024-03-01 12:20:37 +08:00