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

157 Commits

Author SHA1 Message Date
liguoyang
ddbe7386ce refactor 文件版本重构 2024-04-03 11:47:36 +08:00
liguoyang
4a612f6b24 feat 点位图 2024-04-03 11:47:36 +08:00
liguoyang
867c212222 fix 人事范围调整 2024-04-02 13:41:36 +08:00
liguoyang
2c91eda6a0 fix framework 2024-04-02 10:11:11 +08:00
liguoyang
03cb7ba259 fix 消费明细记录 2024-04-01 17:10:15 +08:00
liguoyang
175ca143e2 feat 订单消费数据增加软删除 2024-04-01 11:12:55 +08:00
liguoyang
521543a79e fix 优化gainfo 2024-03-26 12:40:34 +08:00
liguoyang
b617e6cdc9 fix 岗位表索引 2024-03-26 12:06:54 +08:00
liguoyang
0a4cf134d8 fix 查询优化 2024-03-26 11:57:26 +08:00
liguoyang
ca1c41eb33 fix 枚举描述 2024-03-25 10:17:12 +08:00
cheche
af61cb017a fix 删除日志优化 2024-03-23 00:32:00 +08:00
liguoyang
d6a08183b2 fix 预定就餐送货地点 2024-03-23 00:30:34 +08:00
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
85220f87b8 fix cancelid默认值 2024-03-19 12:40:49 +08:00
liguoyang
793a3325f2 Squashed commit of the following: 
commit d4ab7d407a141b80024f85eeaab0062bea016051
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 10:23:30 2024 +0800

    merge error

commit 6204fa4ed15e0be303f7eb62307476725b8e7e36
Merge: 7290f0b aaeacf4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 10:19:41 2024 +0800

    Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission

commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 15:05:28 2024 +0800

    fix 获取用户权限设备 优化

commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 13:13:23 2024 +0800

    fix  第一

commit aaeacf4ffa778eb6a6104e2349357644d038151b
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 15:05:28 2024 +0800

    fix 获取用户权限设备 优化

commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 14:00:53 2024 +0800

    fix 营业点配置权限

commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 13:13:23 2024 +0800

    fix  第一
 2024-03-19 12:07:05 +08:00
liguoyang
e8a98c614c add 补充实体变更 2024-03-19 12:07:05 +08:00
liguoyang
7b83014119 fix 优化菜品保存和分页 2024-03-19 12:06:50 +08:00
liguoyang
c825531fda fix 提交可编译版本 2024-03-19 12:06:26 +08:00
liguoyang
3005443392 feat 菜品/菜单配置 2024-03-19 12:06:26 +08:00
liguoyang
97fb157c9f fix 营业点权限调整 2024-03-19 12:06:26 +08:00
liguoyang
99e1c8f125 fix 实体变更 2024-03-19 12:06:26 +08:00
liguoyang
d327e9e3aa fix 临时修改送餐代码 2024-03-19 12:06:26 +08:00
cheche
8ed8addbf3 fix 表增加ITenantid 2024-03-19 12:06:26 +08:00
cheche
69a80f2263 fix 字段修改1 2024-03-15 12:39:43 +08:00
cheche
9fc0719bad feat 配置菜品菜单 2024-03-15 10:40:05 +08:00
liguoyang
7a6bedf3f4 fix 优化任务状态 2024-03-14 20:36:14 +08:00
liguoyang
2cdba175bd fix 优化唯一编码更新问题 2024-03-14 18:50:59 +08:00
liguoyang
89a93d2a69 fix 同步人员控制人事范围 2024-03-14 18:44:04 +08:00
liguoyang
6fcb73f7a9 fix 营业点增加供应商(承包商) 2024-03-14 18:42:46 +08:00
liguoyang
944d9c2291 fix 实体继承处理 2024-03-14 18:30:27 +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
16be030748 feat 餐补接收 2024-03-14 16:35:38 +08:00
cheche
53dd000f34 feat 菜单订单控制器 2024-03-13 18:55:12 +08:00
cheche
20cf421a3c feat 菜单菜品实体 2024-03-13 14:20:52 +08:00
cheche
3b4b837994 fix 金额变正新增设备名称 2024-03-11 10:31:59 +08:00
liguoyang
64a63e2e49 feat 同步账号 2024-03-10 00:55:51 +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
bbd7659320 fix 同步任务调整 2024-03-09 12:13:11 +08:00
liguoyang
27663b4e53 fix 数据类型调整 2024-03-08 16:42:22 +08:00
liguoyang
83aa9cb954 fix 优化细节 2024-03-06 22:51:39 +08:00
liguoyang
04f20e7cf2 fix 唯一号处理 2024-03-06 22:36:02 +08:00
liguoyang
c0f1b15b10 fix 设备模板移除tenantId 2024-03-06 21:57:16 +08:00
liguoyang
14c63ead73 fix 优化查询判断 2024-03-06 21:40:34 +08:00
liguoyang
107b5b970f fix 编译错误 2024-03-06 19:43:43 +08:00
liguoyang
21b7ec64b2 fix 默认值 2024-03-06 19:39:14 +08:00
liguoyang
9f771bc865 fix 优化细节和tenant问题 2024-03-06 19:22:14 +08:00
liguoyang
1f17e7a92b fix 移除逻辑删除字段 2024-03-06 16:05:11 +08:00