Commit 0cd7bca209bd2206afd428e27eef144ce3505169
1 parent
4a111d2c
chore:mybatis from 3.5.10.1 to 3.5.12
Showing
2 changed files
with
2 additions
and
38 deletions
yudao-dependencies/pom.xml
| @@ -24,9 +24,9 @@ | @@ -24,9 +24,9 @@ | ||
| 24 | <!-- DB 相关 --> | 24 | <!-- DB 相关 --> |
| 25 | <druid.version>1.2.24</druid.version> | 25 | <druid.version>1.2.24</druid.version> |
| 26 | <mybatis.version>3.5.19</mybatis.version> | 26 | <mybatis.version>3.5.19</mybatis.version> |
| 27 | - <mybatis-plus.version>3.5.10.1</mybatis-plus.version> | 27 | + <mybatis-plus.version>3.5.12</mybatis-plus.version> |
| 28 | + <mybatis-plus-join.version>1.5.4</mybatis-plus-join.version> | ||
| 28 | <dynamic-datasource.version>4.3.1</dynamic-datasource.version> | 29 | <dynamic-datasource.version>4.3.1</dynamic-datasource.version> |
| 29 | - <mybatis-plus-join.version>1.4.13</mybatis-plus-join.version> | ||
| 30 | <easy-trans.version>3.0.6</easy-trans.version> | 30 | <easy-trans.version>3.0.6</easy-trans.version> |
| 31 | <redisson.version>3.41.0</redisson.version> | 31 | <redisson.version>3.41.0</redisson.version> |
| 32 | <dm8.jdbc.version>8.1.3.140</dm8.jdbc.version> | 32 | <dm8.jdbc.version>8.1.3.140</dm8.jdbc.version> |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
| @@ -208,12 +208,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -208,12 +208,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | @Override | 210 | @Override |
| 211 | - public <S, X> MPJLambdaWrapperX<T> selectCount(SFunction<S, ?> column, String alias) { | ||
| 212 | - super.selectCount(column, alias); | ||
| 213 | - return this; | ||
| 214 | - } | ||
| 215 | - | ||
| 216 | - @Override | ||
| 217 | public <S, X> MPJLambdaWrapperX<T> selectCount(SFunction<S, ?> column, SFunction<X, ?> alias) { | 211 | public <S, X> MPJLambdaWrapperX<T> selectCount(SFunction<S, ?> column, SFunction<X, ?> alias) { |
| 218 | super.selectCount(column, alias); | 212 | super.selectCount(column, alias); |
| 219 | return this; | 213 | return this; |
| @@ -226,12 +220,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -226,12 +220,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 226 | } | 220 | } |
| 227 | 221 | ||
| 228 | @Override | 222 | @Override |
| 229 | - public <S, X> MPJLambdaWrapperX<T> selectSum(SFunction<S, ?> column, String alias) { | ||
| 230 | - super.selectSum(column, alias); | ||
| 231 | - return this; | ||
| 232 | - } | ||
| 233 | - | ||
| 234 | - @Override | ||
| 235 | public <S, X> MPJLambdaWrapperX<T> selectSum(SFunction<S, ?> column, SFunction<X, ?> alias) { | 223 | public <S, X> MPJLambdaWrapperX<T> selectSum(SFunction<S, ?> column, SFunction<X, ?> alias) { |
| 236 | super.selectSum(column, alias); | 224 | super.selectSum(column, alias); |
| 237 | return this; | 225 | return this; |
| @@ -244,12 +232,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -244,12 +232,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 244 | } | 232 | } |
| 245 | 233 | ||
| 246 | @Override | 234 | @Override |
| 247 | - public <S, X> MPJLambdaWrapperX<T> selectMax(SFunction<S, ?> column, String alias) { | ||
| 248 | - super.selectMax(column, alias); | ||
| 249 | - return this; | ||
| 250 | - } | ||
| 251 | - | ||
| 252 | - @Override | ||
| 253 | public <S, X> MPJLambdaWrapperX<T> selectMax(SFunction<S, ?> column, SFunction<X, ?> alias) { | 235 | public <S, X> MPJLambdaWrapperX<T> selectMax(SFunction<S, ?> column, SFunction<X, ?> alias) { |
| 254 | super.selectMax(column, alias); | 236 | super.selectMax(column, alias); |
| 255 | return this; | 237 | return this; |
| @@ -262,12 +244,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -262,12 +244,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 262 | } | 244 | } |
| 263 | 245 | ||
| 264 | @Override | 246 | @Override |
| 265 | - public <S, X> MPJLambdaWrapperX<T> selectMin(SFunction<S, ?> column, String alias) { | ||
| 266 | - super.selectMin(column, alias); | ||
| 267 | - return this; | ||
| 268 | - } | ||
| 269 | - | ||
| 270 | - @Override | ||
| 271 | public <S, X> MPJLambdaWrapperX<T> selectMin(SFunction<S, ?> column, SFunction<X, ?> alias) { | 247 | public <S, X> MPJLambdaWrapperX<T> selectMin(SFunction<S, ?> column, SFunction<X, ?> alias) { |
| 272 | super.selectMin(column, alias); | 248 | super.selectMin(column, alias); |
| 273 | return this; | 249 | return this; |
| @@ -280,12 +256,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -280,12 +256,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 280 | } | 256 | } |
| 281 | 257 | ||
| 282 | @Override | 258 | @Override |
| 283 | - public <S, X> MPJLambdaWrapperX<T> selectAvg(SFunction<S, ?> column, String alias) { | ||
| 284 | - super.selectAvg(column, alias); | ||
| 285 | - return this; | ||
| 286 | - } | ||
| 287 | - | ||
| 288 | - @Override | ||
| 289 | public <S, X> MPJLambdaWrapperX<T> selectAvg(SFunction<S, ?> column, SFunction<X, ?> alias) { | 259 | public <S, X> MPJLambdaWrapperX<T> selectAvg(SFunction<S, ?> column, SFunction<X, ?> alias) { |
| 290 | super.selectAvg(column, alias); | 260 | super.selectAvg(column, alias); |
| 291 | return this; | 261 | return this; |
| @@ -298,12 +268,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | @@ -298,12 +268,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { | ||
| 298 | } | 268 | } |
| 299 | 269 | ||
| 300 | @Override | 270 | @Override |
| 301 | - public <S, X> MPJLambdaWrapperX<T> selectLen(SFunction<S, ?> column, String alias) { | ||
| 302 | - super.selectLen(column, alias); | ||
| 303 | - return this; | ||
| 304 | - } | ||
| 305 | - | ||
| 306 | - @Override | ||
| 307 | public <S, X> MPJLambdaWrapperX<T> selectLen(SFunction<S, ?> column, SFunction<X, ?> alias) { | 271 | public <S, X> MPJLambdaWrapperX<T> selectLen(SFunction<S, ?> column, SFunction<X, ?> alias) { |
| 308 | super.selectLen(column, alias); | 272 | super.selectLen(column, alias); |
| 309 | return this; | 273 | return this; |