解决git冲突

liurunyu

2024-07-25 a37271af0a5a2eb04ca23c80cca32567c968fa8e

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java

@@ -18,7 +18,7 @@
                })
        }
)
@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa"})
@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa","com.dy.pipIrrGlobal.daoSe"})
public class PipIrrBaseApplication {

    public static void main(String[] args) {