liguoyang db094bc768 Merge remote-tracking branch 'origin/development' into development ...

# Conflicts:
#	Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

2024-05-24 15:16:44 +08:00

..

BusinessShift

fix 数据添加有误处理,展示排序

2024-05-24 14:37:03 +08:00

Device

Merge remote-tracking branch 'origin/development' into development

2024-05-24 15:16:44 +08:00

Dishes

fix framework

2024-04-02 10:11:11 +08:00

Map

feat 点位图

2024-04-03 11:50:28 +08:00

MealUser

fix 部门号赋值

2024-04-07 19:57:12 +08:00

Organization

fix 身份证匹配

2024-04-20 15:29:52 +08:00

Packs

Squashed commit of the following:

2024-04-20 15:29:52 +08:00

Places

fix 营业点保存设备

2024-04-07 11:04:29 +08:00

Properties

fix 获取档案失败自动发起同步任务

2024-04-15 17:01:09 +08:00

Summary

fix 权限重发增加是否离职处理

2024-04-07 20:26:10 +08:00

appsettings.Development.json

Squashed commit of the following:

2024-04-20 15:29:52 +08:00

appsettings.json

fix redis配置

2024-04-16 11:13:41 +08:00

Dlhis.Basic.csproj

fix 命名修改

2024-05-07 14:45:56 +08:00

Dockerfile

fix 获取档案失败自动发起同步任务

2024-04-15 17:01:09 +08:00

Program.cs

fix 框架升级

2024-04-09 15:53:49 +08:00