Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java
#	src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java
#	src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java
#	src/main/resources/mappers/StaticRuleMapper.xml
#	src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java
#	src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java

src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java

@@ -95,7 +95,7 @@ public class StaticRuleController implements StaticRuleControllerApi {
     @Override
     @PostMapping("/{id}/update")
     public ResponseResult updateStaticRule(@PathVariable Integer id,
-                                        @RequestBody @Valid StaticRuleObject object) {
+                                           @RequestBody @Valid StaticRuleObject object) {
         log.info("修改静态规则: {}", object);
         //调用service修改
         Integer updateValid = staticRuleService.updateStaticRule(id, object);