Commit Graph

Select branches

Hide Pull Requests

master

yuenan

Mono Color

• f83afdb4d0 fix 查询分页 cheche 2024-01-26 17:40:23 +08:00
• 40c655c9ff fix 调整 cheche 2024-01-26 15:35:25 +08:00
• d435004a97 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-26 15:34:39 +08:00
• d4b2ee4662 fix 查询单价保留两位小数 cheche 2024-01-26 15:34:24 +08:00
• 7ec29ab113 fix 档案增加搜索 liguoyang 2024-01-26 15:11:17 +08:00
• 9a88977339 fix 取消必选costid cheche 2024-01-26 11:55:15 +08:00
• 6a2f8e4a9c fix 限制本地上传大小 cheche 2024-01-26 10:31:57 +08:00
• 930ba41220 fix 整理minio cheche 2024-01-26 10:26:06 +08:00
• b5ccf3008e Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-26 09:27:17 +08:00
• 3b0f923c46 feat 本地上传 cheche 2024-01-26 09:27:09 +08:00
• 7f6091d757 fix 查询缺少字段 liguoyang 2024-01-25 17:26:55 +08:00
• 93b4f2a5aa fix 请求方式修改 liguoyang 2024-01-25 17:20:45 +08:00
• 8bbdac9c17 fix 配置值范围整理,保存配置处理 liguoyang 2024-01-25 17:15:41 +08:00
• 55cce895c9 fix 优化查询null值,注释 liguoyang 2024-01-25 16:59:30 +08:00
• b371a5b73e Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-25 15:31:08 +08:00
• c163e2098f fix 成本中心统计 cheche 2024-01-25 15:31:02 +08:00
• 54510f28ea fix 移除brand字段 liguoyang 2024-01-25 14:43:21 +08:00
• 83c3238a14 fix 列json格式移除 liguoyang 2024-01-25 14:36:33 +08:00
• 5bd0cec44e fix 编译错误 liguoyang 2024-01-25 14:30:25 +08:00
• e669134fea fix 单独的设备分页类型 liguoyang 2024-01-25 14:29:33 +08:00
• f9c5a816b1 fix 调整任务时间,实体映射类型 liguoyang 2024-01-25 14:14:27 +08:00
• ff6a89865a 合并Minlopack冲突 cheche 2024-01-25 12:24:42 +08:00
• 4f5a2c1c2e feat minlo初步搭建 cheche 2024-01-25 12:23:33 +08:00
• 7044fc49f2 fix 字段类型调整 liguoyang 2024-01-25 11:03:28 +08:00
• 25ea734d08 fix 注释minio注入 liguoyang 2024-01-25 10:47:28 +08:00
• 4396d7a672 fix 注释表自动生成 liguoyang 2024-01-24 20:56:30 +08:00
• 51c80a242e fix 调试大华设备对接 liguoyang 2024-01-24 20:46:55 +08:00
• a36ff46722 fix 根据营业点号获取餐次名称为null cheche 2024-01-24 19:08:06 +08:00
• eb235ae154 fix 获取餐次guid cheche 2024-01-22 17:38:07 +08:00
• 0fa8cba30a fix 优化判断 liguoyang 2024-01-22 10:48:18 +08:00
• e749a6cc14 fix 升级到0.5.2,优化任务生成 liguoyang 2024-01-22 09:45:39 +08:00
• ce939b0a29 fix 更新Kurisu.AspNetCore (0.5.1) cheche 2024-01-22 09:21:07 +08:00
• 82574d78a4 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-19 15:08:30 +08:00
• c4891bd807 fix 枚举,实体调整 liguoyang 2024-01-19 13:31:17 +08:00
• 6480501a03 fix 补充注释 liguoyang 2024-01-19 13:30:52 +08:00
• 7f05cbc368 fix 下发任务结构修改,根据类型处理 liguoyang 2024-01-19 13:30:35 +08:00
• f002cf4e45 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-19 11:11:38 +08:00
• 0ae4737c0f fix 调度时间调整 liguoyang 2024-01-19 10:29:13 +08:00
• ce8f64fee3 fix 优化下发创建 liguoyang 2024-01-18 19:00:05 +08:00
• be2552be32 fix 修改区间判断 liguoyang 2024-01-18 18:24:02 +08:00
• bf64647d71 fix todo cheche 2024-01-18 18:27:31 +08:00
• e7b74ff2b3 fix 修改区间判断 liguoyang 2024-01-18 18:24:02 +08:00
• fd7034ad49 fix 查询调整 liguoyang 2024-01-18 17:50:56 +08:00
• a7b01ff7b3 fix 消费区间判断 liguoyang 2024-01-18 17:46:38 +08:00
• 25e88710b2 fix 时间判断 cheche 2024-01-18 17:32:50 +08:00
• a316cfcb8c Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-18 17:23:45 +08:00
• 441b173469 fix 减少冗余字段,兼容userId liguoyang 2024-01-18 17:23:20 +08:00
• 13f8bde2ea fix 消费时间判断ConsumeIsPresent2Async cheche 2024-01-18 17:20:19 +08:00
• ae946a0bcc fix 时间区间判断 liguoyang 2024-01-18 15:43:45 +08:00
• 9440f4cf58 fix 重置消费类型处理 liguoyang 2024-01-18 13:10:13 +08:00
• ef96cae0bf fix 统计修正 cheche 2024-01-18 11:03:32 +08:00
• 2000ea3a0e feat 批量获取人口post cheche 2024-01-17 18:39:56 +08:00
• 3b6022e2c0 fix shift取消名称 cheche 2024-01-17 17:57:35 +08:00
• 7c36528646 fix 去除餐次名称 cheche 2024-01-17 16:29:00 +08:00
• c97daa2554 fix 批量人脸 cheche 2024-01-17 14:25:47 +08:00
• ba9211ef9e fix 批量获取人脸 cheche 2024-01-17 14:10:30 +08:00
• 5e8bd7b08f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-17 10:42:24 +08:00
• 7aa2a071e0 feat 批量获取人脸照 cheche 2024-01-17 10:42:18 +08:00
• fddb0b12fc fix 批量更新任务状态 liguoyang 2024-01-17 10:42:09 +08:00
• fc5ee32f93 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-17 09:15:55 +08:00
• cda9b86212 fix 消费记录查询 cheche 2024-01-17 09:15:49 +08:00
• 02b38b9b47 add 增加档案id返回 liguoyang 2024-01-16 19:13:07 +08:00
• be5b702787 fix 重构数据同步 liguoyang 2024-01-16 18:59:28 +08:00
• 9b0caabac4 fix 消费查询接口修改 cheche 2024-01-16 17:38:02 +08:00
• a520782f36 fix 字段命名错误 liguoyang 2024-01-16 15:30:22 +08:00
• 3377d08631 fix 人脸照片相同不产生任务 liguoyang 2024-01-16 15:22:59 +08:00
• 092beb5632 fix 优化任务生成userNos为空情况 liguoyang 2024-01-16 15:11:40 +08:00
• ae84b48795 fix 成本日期判断 liguoyang 2024-01-16 14:37:45 +08:00
• c2b5e12ffe fix 人脸修改任务生成 liguoyang 2024-01-16 14:36:44 +08:00
• 9758f3e4b5 feat serilog日志输出到mysql liguoyang 2024-01-16 14:23:53 +08:00
• 1979b7297c Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-16 14:04:18 +08:00
• e7e186b9a1 feat 消费记录查询 cheche 2024-01-16 14:04:03 +08:00
• d65ac0912d fix 回复时间区间判断 liguoyang 2024-01-16 12:04:48 +08:00
• 6ba39eabc1 fix 返回id liguoyang 2024-01-16 11:10:24 +08:00
• 6cd7f63b98 fix 查询汇总 liguoyang 2024-01-15 17:56:34 +08:00
• b8364815ac feat 获取考勤设备 liguoyang 2024-01-15 17:37:21 +08:00
• 01ec274031 feat 根据工号获取人脸链接 liguoyang 2024-01-15 16:53:41 +08:00
• a0384e5179 fix 日志级别 liguoyang 2024-01-15 16:48:03 +08:00
• 7a42f4938e fix 转成接口方法 liguoyang 2024-01-15 15:45:01 +08:00
• da0ceaa939 fix 日志级别处理 liguoyang 2024-01-15 15:33:06 +08:00
• ea5761d9b4 fix 档案组,设备权限分配 liguoyang 2024-01-15 14:55:26 +08:00
• 7d2c041bb9 fix 调整设备权限配置 liguoyang 2024-01-15 13:48:13 +08:00
• 10f0918753 fix 人脸url重新获取 liguoyang 2024-01-15 13:47:29 +08:00
• 8285e9e7da add 补充缺失代码 liguoyang 2024-01-15 13:37:38 +08:00
• 415b985bb3 fix 获取token修改 cheche 2024-01-15 13:36:34 +08:00
• 7013f1507e Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-15 12:57:54 +08:00
• de74bc6868 feat 获取新token cheche 2024-01-15 12:57:47 +08:00
• 4102422792 add 汇总金额 liguoyang 2024-01-15 10:49:45 +08:00
• 5b818c8e10 feat 增加作废明细 liguoyang 2024-01-15 10:14:25 +08:00
• 529d5f732c fix 删除任务无需返回多余信息 liguoyang 2024-01-14 23:03:44 +08:00
• b957ea5f4d feat 任务下发生成 liguoyang 2024-01-14 22:50:04 +08:00
• 64c15ad305 fix 优化任务领取,任务状态更新 liguoyang 2024-01-14 19:59:38 +08:00
• 79bc32c959 feat 设备任务领取 liguoyang 2024-01-13 20:53:04 +08:00
• 24b026aa04 fix 查询设备号匹配问题 liguoyang 2024-01-12 17:51:30 +08:00
• 583e63707b fix 优化参数值数据 liguoyang 2024-01-12 17:02:22 +08:00
• cb2562c8b8 fix 优化消费充值代码 liguoyang 2024-01-12 16:18:44 +08:00
• 74137c9f44 fix 取消base64校验 liguoyang 2024-01-12 16:17:30 +08:00
• 2e852c3d49 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-12 16:06:14 +08:00
• e86d3a6140 fix 通过唯一号获取设备 cheche 2024-01-12 16:06:06 +08:00
• 7e08811190 fix 取消自动生成表结构 liguoyang 2024-01-12 16:03:11 +08:00