Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

svr/svr-internet-hospital-job/src/main/resources/system.properties

@@ -41,11 +41,11 @@ health_upload_weishangbao_remind_job=0 45 8 * * ? *
health_upload_total_remind_job=0 0 9 * * ? *
DailyReportRemindJob=0 50 17 * * ? *
DailyReportRemindJob=0 50 17 * * 1,2,3,4,5
DailyReportRemindSecondJob=0 0 20 * * ? *
DailyReportRemindSecondJob=0 0 20 * * 1,2,3,4,5
DailyReportTotalRemindJob=0 0 22 * * ? *
DailyReportTotalRemindJob=0 0 22 * * 1,2,3,4,5
DailyReportWsbTotalRemindJob=0 0 21 * * ? *
DailyReportWsbTotalRemindJob=0 0 21 * * 1,2,3,4,5