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/specialist/rehabilitation/RehabilitationTemplateDetailDO.java

common/common-entity/src/main/java/com/yihu/jw/entity/care/securitymonitoring/SecurityMonitoringOrderDO.java

@@ -27,8 +27,8 @@ public class SecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator {
        signed(3, "已签到"),
        registerSummary(4, "已登记小结,"),
        waitForAdded(5, "待补录"),
        waitForCommnet(5, "待评价"),
        complete(6,"已完成");
        waitForCommnet(6, "待评价"),
        complete(7,"已完成");
        private Integer type;
        private String desc;