Merge branch 'dev/mrman20200923_1.5.0' into debug

mrman-service/src/main/java/com/diagbot/dto/GetModuleInfoOneDTO.java

@@ -22,6 +22,7 @@ public class GetModuleInfoOneDTO {
     private Long hospitalId;
     //数据模块ID
     private Long modeId;
+    private Integer defaultModule =0; //默认模版是否开启(0-否 1-是)
     //模板明细
     private Map<Integer, List<QcModuleDetailDTO>> moduleDetail;
     // 已选择的文书