Commit d650a0b1239dd3454214309d04a2c9e9096d25ca

Authored by YunaiV
1 parent 0cd7bca2

chore:mybatis from 3.5.10.1 to 3.5.12

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/MPJLambdaWrapperX.java
@@ -118,7 +118,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> { @@ -118,7 +118,6 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> {
118 118
119 @Override 119 @Override
120 public <X> MPJLambdaWrapperX<T> orderByDesc(SFunction<X, ?> column) { 120 public <X> MPJLambdaWrapperX<T> orderByDesc(SFunction<X, ?> column) {
121 - //noinspection unchecked  
122 super.orderByDesc(true, column); 121 super.orderByDesc(true, column);
123 return this; 122 return this;
124 } 123 }
@@ -208,6 +207,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; { @@ -208,6 +207,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; {
208 } 207 }
209 208
210 @Override 209 @Override
  210 + public <S> MPJLambdaWrapperX<T> selectCount(SFunction<S, ?> column, String alias) {
  211 + super.selectCount(column, alias);
  212 + return this;
  213 + }
  214 +
  215 + @Override
211 public <S, X> MPJLambdaWrapperX<T> selectCount(SFunction<S, ?> column, SFunction<X, ?> alias) { 216 public <S, X> MPJLambdaWrapperX<T> selectCount(SFunction<S, ?> column, SFunction<X, ?> alias) {
212 super.selectCount(column, alias); 217 super.selectCount(column, alias);
213 return this; 218 return this;
@@ -220,6 +225,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; { @@ -220,6 +225,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; {
220 } 225 }
221 226
222 @Override 227 @Override
  228 + public <S> MPJLambdaWrapperX<T> selectSum(SFunction<S, ?> column, String alias) {
  229 + super.selectSum(column, alias);
  230 + return this;
  231 + }
  232 +
  233 + @Override
223 public <S, X> MPJLambdaWrapperX<T> selectSum(SFunction<S, ?> column, SFunction<X, ?> alias) { 234 public <S, X> MPJLambdaWrapperX<T> selectSum(SFunction<S, ?> column, SFunction<X, ?> alias) {
224 super.selectSum(column, alias); 235 super.selectSum(column, alias);
225 return this; 236 return this;
@@ -232,6 +243,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; { @@ -232,6 +243,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; {
232 } 243 }
233 244
234 @Override 245 @Override
  246 + public <S> MPJLambdaWrapperX<T> selectMax(SFunction<S, ?> column, String alias) {
  247 + super.selectMax(column, alias);
  248 + return this;
  249 + }
  250 +
  251 + @Override
235 public <S, X> MPJLambdaWrapperX<T> selectMax(SFunction<S, ?> column, SFunction<X, ?> alias) { 252 public <S, X> MPJLambdaWrapperX<T> selectMax(SFunction<S, ?> column, SFunction<X, ?> alias) {
236 super.selectMax(column, alias); 253 super.selectMax(column, alias);
237 return this; 254 return this;
@@ -244,6 +261,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; { @@ -244,6 +261,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; {
244 } 261 }
245 262
246 @Override 263 @Override
  264 + public <S> MPJLambdaWrapperX<T> selectMin(SFunction<S, ?> column, String alias) {
  265 + super.selectMin(column, alias);
  266 + return this;
  267 + }
  268 +
  269 + @Override
247 public <S, X> MPJLambdaWrapperX<T> selectMin(SFunction<S, ?> column, SFunction<X, ?> alias) { 270 public <S, X> MPJLambdaWrapperX<T> selectMin(SFunction<S, ?> column, SFunction<X, ?> alias) {
248 super.selectMin(column, alias); 271 super.selectMin(column, alias);
249 return this; 272 return this;
@@ -256,6 +279,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; { @@ -256,6 +279,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; {
256 } 279 }
257 280
258 @Override 281 @Override
  282 + public <S> MPJLambdaWrapperX<T> selectAvg(SFunction<S, ?> column, String alias) {
  283 + super.selectAvg(column, alias);
  284 + return this;
  285 + }
  286 +
  287 + @Override
259 public <S, X> MPJLambdaWrapperX<T> selectAvg(SFunction<S, ?> column, SFunction<X, ?> alias) { 288 public <S, X> MPJLambdaWrapperX<T> selectAvg(SFunction<S, ?> column, SFunction<X, ?> alias) {
260 super.selectAvg(column, alias); 289 super.selectAvg(column, alias);
261 return this; 290 return this;
@@ -268,6 +297,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; { @@ -268,6 +297,12 @@ public class MPJLambdaWrapperX&lt;T&gt; extends MPJLambdaWrapper&lt;T&gt; {
268 } 297 }
269 298
270 @Override 299 @Override
  300 + public <S> MPJLambdaWrapperX<T> selectLen(SFunction<S, ?> column, String alias) {
  301 + super.selectLen(column, alias);
  302 + return this;
  303 + }
  304 +
  305 + @Override
271 public <S, X> MPJLambdaWrapperX<T> selectLen(SFunction<S, ?> column, SFunction<X, ?> alias) { 306 public <S, X> MPJLambdaWrapperX<T> selectLen(SFunction<S, ?> column, SFunction<X, ?> alias) {
272 super.selectLen(column, alias); 307 super.selectLen(column, alias);
273 return this; 308 return this;