Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

Pu Zhibing

8 天以前 870ee717e24b9e08891ae725ec25e2714102842a

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tDriverPromotionActivity_add.html

@@ -167,7 +167,7 @@

        var ajax = new $ax(Feng.ctxPath + "/tDriverPromotionActivity/add", function(data){
            if(data=="602"){
                Feng.error("活动时间已重复");
                Feng.error("该区域活动时间存在重复时间段，请核实后添加！");
            }else {
                Feng.success("添加成功!");
                TDriverPromotionActivityInfoDlg.close();