Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/system/BusinessSystem.java

@@ -27,8 +27,6 @@
   @org.yeshi.utils.mybatis.Column(name="id")

   private Long id;

   





   @org.yeshi.utils.mybatis.Column(name="name")

   @Column(name = "`name`", length = 50)

   private String name;