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

yujian

2020-05-19 b7a90c576ac6b482c68ad6d0c2777831f9127b4a

 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 {