Merge remote-tracking branch 'origin/master'

16639036659

2023-07-13 aa9c34737dd81d3ed4ed05b5f52b7edd8d14dee2

 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlTemplateService.java

@@ -13,4 +13,8 @@
     */
    List<PreventRiskControlTemplate> listMeasureTemplates();

    /**
     * 管控措施- 获取管控措施模板 - by id
     */
    PreventRiskControlTemplate getControlTemplateById(Byte classify2);
}