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

admin

2020-02-27 be05279bfbc10defc002d7718f46a49f3c96d05e

 fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java

@@ -17,7 +17,6 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "`yeshi_ec_monitor_data`")

@org.yeshi.utils.mybatis.Table("yeshi_ec_monitor_data")

public class DataMonitor {