Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-16 578b6efb20248f244ce7bd46c26361c79e5270f1

 .gitignore

@@ -17,3 +17,8 @@
myBatisPlusGenerator/src/test/
screen-common/src/main/resources/
screen-manage/src/test/
/home
/screen-api/screen-api.iml
/screen-job/screen-job.iml
/screen-common/screen-common.iml
/screen-manage/screen-manage.iml