<<<<<<< HEAD 4.0.0 com.dite.znpt parent 1.0.0-SNAPSHOT 17 core sip web flowable pom org.springframework.boot spring-boot-starter-parent 2.7.18 pom import cn.hutool hutool-all 5.8.24 org.apache.maven.plugins maven-compiler-plugin 3.1 17 17 ======= 4.0.0 com.dite.znpt parent 1.0.0-SNAPSHOT 17 core sip web flowable pom org.springframework.boot spring-boot-starter-parent 2.7.18 pom import cn.hutool hutool-all 5.8.24 org.apache.maven.plugins maven-compiler-plugin 3.1 17 17 >>>>>>> 117e02770e868ab78bdce112c2316a990cf9954f