Merge branch 'main' of http://10.10.14.176:3000/huanghai/ccZhiChengTouPiao

src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java

@@ -59,6 +59,14 @@ public class TouPiaoController extends Controller {
     @IsLoginInterface({})
     public void save(String gaoji, String zhongji) {
         String toupiaoren_tel = getCookie("toupiaoren_tel");
+        if (tm.haveFinishTouPiao(toupiaoren_tel)) {
+            Kv kv = Kv.create();
+            kv.put("success", false);
+            kv.put("msg", "您已经投票完成，不能再次进入系统！");
+            renderJson(kv);
+            return;
+        }
+
         //检查中级是不是2个，高级是不是2个
         String[] gaojiArray = gaoji.split(",");
         String[] zhongjiArray = zhongji.split(",");

一键推拉.cmd

@@ -6,6 +6,6 @@ git config --global core.autocrlf false
 
 git add -A .
 git commit -am 'commit'
+git fetch
 git pull
-::git fetch
 git push origin master