Merge remote-tracking branch 'origin/master'

src/main/java/com/sztzjy/forex/trading_trading/service/GradeWeightService.java

@@ -80,8 +80,13 @@ public class GradeWeightService {
         GradeWeightExample example = new GradeWeightExample();
         GradeWeightExample.Criteria criteria = example.createCriteria();
         criteria.andWeightIdEqualTo(weightId);
+        if (yield > 1000D) {
+             criteria.andLevelEqualTo(1);
+        }else{
             criteria.andMaxProfitGreaterThan(yield);
             criteria.andMinProfitLessThanOrEqualTo(yield);
+        }
+
         GradeWeight gradeWeights = gradeWeightMapper.selectByExample(example).get(0);
         return gradeWeights;
     }