merge release_3.0.0 #1

Merged
liujiatong merged 817 commits from dev_3.0.0 into release_3.0.0 11 months ago
Owner
There is no content yet.
liujiatong added 817 commits 11 months ago
4ba733bea3 manage:1. 屏蔽单点登录限制
2. 修复请求出现异常时未有效清楚认证信息
158196e119 Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0
# Conflicts:
#	virtual-patient-web/src/main/java/com/supervision/controller/UserController.java
c0d0565aab Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0
# Conflicts:
#	virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java
3e2d1ca9a9 manage: 1.fix下载过程中,文件名中文乱码
2. fix 下载错误excel文件,文件名不是excel后缀
6bc8bd7ed7 Merge remote-tracking branch 'origin/dev_3.0.0' into dev_3.0.0
# Conflicts:
#	virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java
91f5b56466 1: 问诊大厅 分页查询病例信息列表接口设置查询结果为已发布的数据
2. manage:添加修改病历状态的接口
3. 重构queryMedicalRecManagePage接口入参
liujiatong closed this pull request 11 months ago
liujiatong reopened this pull request 11 months ago
liujiatong merged commit 2e068aadbc into release_3.0.0 11 months ago
The pull request has been merged as 2e068aadbc.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b dev_3.0.0 release_3.0.0
git pull origin dev_3.0.0

Step 2:

Merge the changes and update on Gitea.
git checkout release_3.0.0
git merge --no-ff dev_3.0.0
git push origin release_3.0.0
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Yaxin/virtual-patient#1
Loading…
There is no content yet.