Merge remote-tracking branch 'origin/master'

jwtech-framework/src/main/java/com/jianwei/common/core/service/BaseService.java

@@ -29,6 +29,7 @@ public  class BaseService<M extends BaseMapper<T>, T extends BaseEntity> extends
     RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
 
     public IPage<T>  selectPage(SearchParam<T> sp){
+
         return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()), BeanToWrapper.getWrapper(sp));
     }
 

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java

@@ -128,4 +128,6 @@ public class BsSgcYxjdDynamicCredit extends BaseEntity
 
     private String publishUnit;
 
+    private String behavior;
+
 }