Merge remote-tracking branch 'origin/master'
# Conflicts: # auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java # modeler/src/style.less
This commit is contained in:
@@ -71,10 +71,6 @@
|
||||
<artifactId>solution-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
|
||||
Reference in New Issue
Block a user