Merge branch 'wangming' into '105'

banner

See merge request !4

src/main/java/com/server/web/controller/BannerController.java

@@ -150,11 +150,11 @@ public class BannerController extends BaseController {
                 baseBanner.setWeight(1);
                 baseBanner.setWeight(1);
             }
             }
             baseBanner.setRemark(request.getParameter("remark"));
             baseBanner.setRemark(request.getParameter("remark"));
-            baseBanner.setIsDelete(0);
-            baseBanner.setIsUp(1);
             if(baseBanner.getId()!=null){
             if(baseBanner.getId()!=null){
                 bannerMapper.updateByPrimaryKeySelective(baseBanner);
                 bannerMapper.updateByPrimaryKeySelective(baseBanner);
             }else{
             }else{
+                baseBanner.setIsDelete(0);
+                baseBanner.setIsUp(1);
                 baseBanner.setCreateDt(new Date());
                 baseBanner.setCreateDt(new Date());
                 bannerMapper.insertSelective(baseBanner);
                 bannerMapper.insertSelective(baseBanner);
             }
             }