Merge branch 'master' into 'pro'

Master

See merge request eshop/biz_service_ebtp_extend!37

src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/ClientVersionCheck.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @ApiModel
 @TableName(value = "client_version_check", autoResultMap = true)
-public class ClientVersionCheck extends BaseEntity implements Serializable {
+public class ClientVersionCheck implements Serializable {
 
 	private static final long serialVersionUID = 1L;