Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java
#	src/main/java/org/rcisoft/business/barrange/entity/BArrange.java
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
#	src/main/resources/mapper/business/barrange/mapper/BArrangeMapper.xml

src/main/java/org/rcisoft/business/bagency/controller/BAgencyController.java

@@ -94,7 +94,6 @@ public class BAgencyController extends PaginationController<BAgency> {
         bAgency.setCreateBy(UserUtil.getUserInfoProp(getToken(), UserUtil.USER_ID));
         bAgencyServiceImpl.queryMoreByPagination(getPaginationUtility(), bAgency);
         return getGridModelResponse();
-    }
-     */
+    }*/
 
 }

src/main/java/org/rcisoft/business/barrange/entity/BSubtask.java

@@ -19,8 +19,7 @@ import java.util.List;
 @AllArgsConstructor
 @Table(name = "b_subtask")
 public class BSubtask  extends IdEntity<BSubtask> {
-
-
+     private static final long serialVersionUID = -5142221328283725461L;
 
      private String arrangeId;
 

src/main/java/org/rcisoft/business/barrange/entity/ScheduleDto.java

@@ -17,6 +17,7 @@ import javax.persistence.Transient;
 @AllArgsConstructor
 public class ScheduleDto extends IdEntity<ScheduleDto>{
 
+    private static final long serialVersionUID = 281845068673189421L;
     /*课程编号*/
     @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
     @NotBlank

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -88,8 +88,6 @@ public class BArrangeServiceImpl implements BArrangeService {
         return new PersistModel(line);
     }
 
-
-
     /**
     * 分页查询 bArrange
     * @return