Conflicts: yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java |
||
|---|---|---|
| .. | ||
| main/java/cn/iocoder/yudao/module/infra | ||
| test | ||
Conflicts: yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java |
||
|---|---|---|
| .. | ||
| main/java/cn/iocoder/yudao/module/infra | ||
| test | ||