Commit Graph

Select branches

Hide Pull Requests

master

yuenan

Mono Color

• fd7b5c5951 fix 修正 cheche 2024-01-12 15:53:06 +08:00
• 3dfa65ea9e fix 获取修改设备 cheche 2024-01-12 15:51:49 +08:00
• 0c28e8d4d3 fix 获取设备 cheche 2024-01-12 15:49:41 +08:00
• 310620b348 feat 获取设备 cheche 2024-01-12 15:42:55 +08:00
• 092beab4b7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-12 12:40:50 +08:00
• 45dbd5ceeb fix 配置时间校验分秒 cheche 2024-01-12 12:40:35 +08:00
• bbab1f4460 fix 处理传入日期的开始时间 liguoyang 2024-01-12 11:40:06 +08:00
• c78b4f923c feat 增加post设备消费记录 liguoyang 2024-01-12 11:15:52 +08:00
• 62a15bef03 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-12 11:12:37 +08:00
• 27fbd7a282 fix 取消device忽略租户id cheche 2024-01-12 11:12:31 +08:00
• a659d49a3f fix 就餐参数配置检验调整 liguoyang 2024-01-12 11:11:42 +08:00
• cd2dedc4f4 fix 取消device字段 cheche 2024-01-12 10:25:41 +08:00
• 43a13a137f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-12 10:05:49 +08:00
• 8158951574 fix 添加设备类型和使用场景字段 cheche 2024-01-12 10:05:44 +08:00
• f888361ee0 add 补充缺失文件 liguoyang 2024-01-11 19:43:12 +08:00
• 15e90d4d16 feat 人脸上传,内部支持客户端授权 liguoyang 2024-01-11 19:38:23 +08:00
• d35b0043c3 fix 查询根据成本日期 liguoyang 2024-01-11 18:21:53 +08:00
• 9a5d9ecd4f fix CanteenSettingItemEnumType参数校验异常信息修正 cheche 2024-01-11 18:18:51 +08:00
• 1133de5850 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-11 18:08:24 +08:00
• 3f91c6109b fix CanteenSettingItemEnumType参数校验 cheche 2024-01-11 18:08:14 +08:00
• 0ad79dbb23 fix FromQuery liguoyang 2024-01-11 16:39:31 +08:00
• e03cb26174 fix userId --> userNo liguoyang 2024-01-11 16:37:17 +08:00
• 5d1b3ad0f7 feat 设备考勤记录考勤上传 liguoyang 2024-01-11 16:31:23 +08:00
• 353844f348 feat 当前人员的消费记录 liguoyang 2024-01-11 16:06:02 +08:00
• 0ac04b0d2d fix 查询错误 liguoyang 2024-01-11 15:54:30 +08:00
• 6af019485d fix 字段修改,消费记录设备查询增加日期 liguoyang 2024-01-11 15:22:30 +08:00
• 212aa2b65d feat 设备获取消费记录 liguoyang 2024-01-11 15:06:07 +08:00
• bfecdacb76 fix 取消匿名访问 liguoyang 2024-01-11 14:49:31 +08:00
• 1e98d9816a fix 字段名称,消费金额,实体注解 liguoyang 2024-01-11 14:26:52 +08:00
• 7aa907a049 合并今日消费记录冲突 cheche 2024-01-11 13:58:40 +08:00
• b278884fcf fix 当天消费记录修正 cheche 2024-01-11 13:55:22 +08:00
• 16813c10f4 fix 优化消费代码处理 liguoyang 2024-01-11 11:53:26 +08:00
• 8c5819b18b fix 实体修改 liguoyang 2024-01-11 10:28:34 +08:00
• 34073e0db0 feat 设备上传记录 liguoyang 2024-01-11 10:28:11 +08:00
• 026fd7b18a fix todo liguoyang 2024-01-10 19:10:45 +08:00
• 1738e52d8d fix 区间判断临时处理 liguoyang 2024-01-10 19:10:38 +08:00
• 3e5e9e4d0a fix 返回激活码 liguoyang 2024-01-10 18:02:39 +08:00
• 46b0965fd9 fix 基础字段处理 liguoyang 2024-01-10 17:37:54 +08:00
• 54835e6cae fix 设备注册自动新增 liguoyang 2024-01-10 17:33:27 +08:00
• 2e51a13c3d Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-10 17:13:30 +08:00
• e7e7e78fd5 fix 订单有效 cheche 2024-01-10 17:13:24 +08:00
• c9c2de80b7 fix 获取餐别增加基地信息 liguoyang 2024-01-10 17:11:36 +08:00
• 5915264df9 fix 设备对接接口忽略tenant liguoyang 2024-01-10 16:53:47 +08:00
• e596367222 fix 取消获取餐别授权 liguoyang 2024-01-10 16:43:54 +08:00
• 15dfaf48dd Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-10 16:41:05 +08:00
• a23058b239 fix 取消授权 liguoyang 2024-01-10 16:40:52 +08:00
• 97f9d94846 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-10 16:39:51 +08:00
• 5e9d4ac2a6 fix 调整消费处理,配置文件显示sql liguoyang 2024-01-10 16:39:12 +08:00
• be88816918 合并 cheche 2024-01-10 16:24:00 +08:00
• 8ae0efe249 fix 调整 cheche 2024-01-10 16:23:20 +08:00
• 7c242370fc fix 注释,下发任务状态分页 liguoyang 2024-01-10 16:13:24 +08:00
• 8dba9e9a3a feat 获取当前人员信息 liguoyang 2024-01-10 14:51:38 +08:00
• be581e43e3 add 档案增加身份认证用户ID liguoyang 2024-01-10 13:35:28 +08:00
• cd31e3fc58 fix 人事范围调用处理 liguoyang 2024-01-10 11:44:59 +08:00
• 21e945727b fix appsetting cheche 2024-01-10 11:31:09 +08:00
• 4a969f586a Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-10 11:21:24 +08:00
• 407d3fbfd4 fix identity tables liguoyang 2024-01-10 11:15:41 +08:00
• 8fe4005ae7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-10 11:09:18 +08:00
• 0e45532a01 fix 订餐测试 cheche 2024-01-10 11:09:00 +08:00
• 76558e2f0a feat 升级版本, 设备权限 liguoyang 2024-01-10 11:06:15 +08:00
• 4b7a0f8682 fix 基础数据代码调整 liguoyang 2024-01-09 17:56:24 +08:00
• 2ac9e4ceb2 fix BasicType类型修正 cheche 2024-01-09 16:28:58 +08:00
• 3d911d4cdb fix 获取档案类型数据 cheche 2024-01-09 12:04:21 +08:00
• 2e6c30e305 fix 档案类型修正 cheche 2024-01-09 11:25:05 +08:00
• 25bdd1edf8 feat 档案表固定字段下拉列表及数据 cheche 2024-01-09 09:47:55 +08:00
• bd20152422 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-09 09:07:53 +08:00
• 4bc02bd170 fix 周期任务时间修正 cheche 2024-01-09 09:07:47 +08:00
• 19bbf9a0fd fix 补充文件 liguoyang 2024-01-08 20:53:41 +08:00
• bb4c617340 fix 用户授权问题,档案调整, liguoyang 2024-01-08 20:49:25 +08:00
• 598444fb96 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-08 11:39:21 +08:00
• 8028376195 feat 档案表下拉列表 cheche 2024-01-08 11:39:14 +08:00
• a4333f7f45 fix 补充代码 liguoyang 2024-01-08 11:36:38 +08:00
• b341a59359 fix 调整无授权处理,增加检查设备是否存在接口 liguoyang 2024-01-08 11:36:10 +08:00
• 2e300811d5 fix 档案字段调整 liguoyang 2024-01-08 11:35:15 +08:00
• dc3f22ac0c fix RequireHttpsMetadata liguoyang 2024-01-08 10:53:03 +08:00
• d712832434 fix prod setting liguoyang 2024-01-08 10:47:15 +08:00
• 6bb12f0deb add user-api liguoyang 2024-01-08 10:38:01 +08:00
• 92cba5c728 fix sln liguoyang 2024-01-08 10:35:38 +08:00
• f4e401d649 fix 用户和菜单权限联合 liguoyang 2024-01-08 10:35:25 +08:00
• 82e77027e3 fix 字段名称 liguoyang 2024-01-08 10:11:06 +08:00
• 18eda12a29 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-06 17:42:13 +08:00
• 062e2538b5 fix 同步接口 cheche 2024-01-06 17:42:06 +08:00
• 1180362376 fix 更新认证配置信息和注释 liguoyang 2024-01-05 15:16:25 +08:00
• ba87dc6c86 fix func字段处理 liguoyang 2024-01-05 12:29:29 +08:00
• dcc1f19219 fix 餐次分页筛选 liguoyang 2024-01-05 10:51:54 +08:00
• 08c4c096e8 feat 设备组分配设备,获取设备 liguoyang 2024-01-04 20:38:24 +08:00
• a8a535153a fix 餐饮订单参数控制,设备组参数返回 liguoyang 2024-01-04 19:47:31 +08:00
• fab6df6910 fix 组织架构同步代码删除 liguoyang 2024-01-04 15:13:39 +08:00
• 894d838b5f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-04 14:42:42 +08:00
• 71ebba471b 解决配置文件冲突 cheche 2024-01-04 14:42:38 +08:00
• ea51bac045 fix 增加设备下发表,枚举调整 liguoyang 2024-01-04 14:41:06 +08:00
• 3d665259b3 feat 人事同步 cheche 2024-01-04 14:40:04 +08:00
• a51ad680f3 fix 增加post请求方式 liguoyang 2024-01-04 11:26:40 +08:00
• d8cf554bdf fix 注册表字段类型调整 liguoyang 2024-01-03 17:36:48 +08:00
• bcec08d10a fix 补充注释,接口兼容设备 liguoyang 2024-01-03 17:34:19 +08:00
• ebffe59360 fix ui展示 liguoyang 2024-01-02 22:11:33 +08:00
• baf18bec47 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development liguoyang 2024-01-02 22:00:06 +08:00
• 8fe7a0c1bd fix auth liguoyang 2024-01-02 21:58:41 +08:00
• bb7765ab1f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-02 09:10:04 +08:00
• a4714544ba feat 增加hangfire账户密码 cheche 2024-01-02 09:09:56 +08:00