Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -850,7 +850,7 @@ public class MicroApiController {
         if(rule == null) return Result.fail().setMsg("未找到规则");
         //判断此条规则是否提交过成绩
 
-        Integer scoreId = 1;//cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(score.getCmptId(),score.getMarkNo(),rule.getId());
+        Integer scoreId = cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(score.getCmptId(),score.getMarkNo(),rule.getId());
         if(scoreId != null){
             return Result.fail().setMsg("已经上传过成绩！");
         }