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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/MaskKey.java

@@ -1,11 +1,7 @@
package com.yeshi.fanli.entity.bus.recommend;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.Table;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



/**

 * 铭感词库

@@ -13,14 +9,14 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "yeshi_ec_mask_key")

@Table("yeshi_ec_mask_key")

public class MaskKey {

   @Id

   @GeneratedValue(strategy = GenerationType.AUTO)

   @Column(name = "`id`")

	
   @Column(name = "id")

   private long id;

   @Column(name = "content")

   private String content;

	


   public MaskKey() {