Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lyb #5

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open

Lyb #5

wants to merge 54 commits into from

Conversation

Silent-Roar
Copy link
Collaborator

No description provided.

迷你能猫Uq and others added 30 commits April 5, 2021 09:47
# Conflicts:
#	init.py
#	templates/index.html
#	templates/static/js/chunk-381da8d8.41b4135e.js
#	templates/static/js/chunk-381da8d8.65d2f889.js
#	templates/static/js/chunk-6321e9c5.4259217d.js
#	templates/static/js/chunk-6321e9c5.c0ff9c3c.js
#	www.py
� Conflicts:
�	.idea/misc.xml
�	.idea/pethos.iml
�	config/base_setting.py
修复了一些之前api的bug,请参照pdf文件
增加了room表与medicine表,请重新建表,参照建表语句.sql与数据库表pdf
实现科室管理,药品管理
修复了一些之前api的bug,请参照pdf文件
增加了room表与medicine表,请重新建表,参照建表语句.sql与数据库表pdf
实现科室管理,药品管理
修复了一些之前api的bug,请参照pdf文件
增加了room表与medicine表,请重新建表,参照建表语句.sql与数据库表pdf
实现科室管理,药品管理
修复了一些之前api的bug,请参照pdf文件
增加了room表与medicine表,请重新建表,参照建表语句.sql与数据库表pdf
补充了查询病种
修改了数据库建表文件,扩大了url范围
Silent-Roar and others added 24 commits April 25, 2021 00:15
� Conflicts:
�	system/testModule/test.py
# Conflicts:
#	model/case.py
#	system/caseModule/case.py
#	system/caseModule/category.py
#	system/caseModule/disease.py
#	system/view.py
� Conflicts:
�	templates/index_b.html
�	templates/static/css/chunk-1893ea90.bd0cfc10.css
�	templates/static/css/chunk-3f528fd9.2c5afd57.css
�	templates/static/css/chunk-53919734.9d538afc.css
�	templates/static/css/chunk-5ce05221.a5843862.css
�	templates/static/css/chunk-99bd0638.6864c738.css
�	templates/static/css/chunk-a76cc1da.7e24bbfb.css
�	templates/static/css/chunk-df5e6a4e.46a08c0c.css
�	templates/static/css/chunk-f8e62f90.2903a7f9.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant