Commit Graph

70 Commits

Author SHA1 Message Date
cheche
8fe4005ae7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-10 11:09:18 +08:00
cheche
0e45532a01 fix 订餐测试 2024-01-10 11:09:00 +08:00
76558e2f0a feat 升级版本, 设备权限 2024-01-10 11:06:15 +08:00
4b7a0f8682 fix 基础数据代码调整 2024-01-09 17:56:24 +08:00
cheche
2ac9e4ceb2 fix BasicType类型修正 2024-01-09 16:28:58 +08:00
cheche
3d911d4cdb fix 获取档案类型数据 2024-01-09 12:04:21 +08:00
cheche
2e6c30e305 fix 档案类型修正 2024-01-09 11:25:05 +08:00
cheche
25bdd1edf8 feat 档案表固定字段下拉列表及数据 2024-01-09 09:47:55 +08:00
cheche
bd20152422 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-09 09:07:53 +08:00
cheche
4bc02bd170 fix 周期任务时间修正 2024-01-09 09:07:47 +08:00
19bbf9a0fd fix 补充文件 2024-01-08 20:53:41 +08:00
bb4c617340 fix 用户授权问题,档案调整, 2024-01-08 20:49:25 +08:00
cheche
598444fb96 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-08 11:39:21 +08:00
cheche
8028376195 feat 档案表下拉列表 2024-01-08 11:39:14 +08:00
a4333f7f45 fix 补充代码 2024-01-08 11:36:38 +08:00
b341a59359 fix 调整无授权处理,增加检查设备是否存在接口 2024-01-08 11:36:10 +08:00
2e300811d5 fix 档案字段调整 2024-01-08 11:35:15 +08:00
dc3f22ac0c fix RequireHttpsMetadata 2024-01-08 10:53:03 +08:00
d712832434 fix prod setting 2024-01-08 10:47:15 +08:00
6bb12f0deb add user-api 2024-01-08 10:38:01 +08:00
92cba5c728 fix sln 2024-01-08 10:35:38 +08:00
f4e401d649 fix 用户和菜单权限联合 2024-01-08 10:35:25 +08:00
82e77027e3 fix 字段名称 2024-01-08 10:11:06 +08:00
cheche
18eda12a29 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-06 17:42:13 +08:00
cheche
062e2538b5 fix 同步接口 2024-01-06 17:42:06 +08:00
1180362376 fix 更新认证配置信息和注释 2024-01-05 15:16:25 +08:00
ba87dc6c86 fix func字段处理 2024-01-05 12:29:29 +08:00
dcc1f19219 fix 餐次分页筛选 2024-01-05 10:51:54 +08:00
08c4c096e8 feat 设备组分配设备,获取设备 2024-01-04 20:38:24 +08:00
a8a535153a fix 餐饮订单参数控制,设备组参数返回 2024-01-04 19:47:31 +08:00
fab6df6910 fix 组织架构同步代码删除 2024-01-04 15:13:39 +08:00
cheche
894d838b5f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-04 14:42:42 +08:00
cheche
71ebba471b 解决配置文件冲突 2024-01-04 14:42:38 +08:00
ea51bac045 fix 增加设备下发表,枚举调整 2024-01-04 14:41:06 +08:00
cheche
3d665259b3 feat 人事同步 2024-01-04 14:40:04 +08:00
a51ad680f3 fix 增加post请求方式 2024-01-04 11:26:40 +08:00
d8cf554bdf fix 注册表字段类型调整 2024-01-03 17:36:48 +08:00
bcec08d10a fix 补充注释,接口兼容设备 2024-01-03 17:34:19 +08:00
ebffe59360 fix ui展示 2024-01-02 22:11:33 +08:00
baf18bec47 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-02 22:00:06 +08:00
8fe7a0c1bd fix auth 2024-01-02 21:58:41 +08:00
cheche
bb7765ab1f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-02 09:10:04 +08:00
cheche
a4714544ba feat 增加hangfire账户密码 2024-01-02 09:09:56 +08:00
1829d8f6a5 fix dockerfile .net 版本 2023-12-29 17:52:51 +08:00
25436c881c fix 代码命名修改,格式调整 2023-12-29 16:54:30 +08:00
cheche
8169d7da5c Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2023-12-29 16:41:33 +08:00
cheche
66eacb685a feat Hnagfire初步搭建 2023-12-29 16:41:24 +08:00
74d8bd7b3f feat 设备分组 2023-12-29 10:09:51 +08:00
f5c8f659e4 fix 档案表代码调整,代码位置 2023-12-28 17:57:21 +08:00
cheche
ef7e08fc13 fix:修复GainfoController位置 2023-12-28 17:39:30 +08:00