Merge remote-tracking branch 'origin/master'

admin/src/main/java/org/springblade/modules/ycwh/entity/AccountEntity.java

@@ -17,13 +17,11 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 账号表 实体类
@@ -35,7 +33,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_account")
 @ApiModel(value = "Account对象", description = "账号表")
 @EqualsAndHashCode(callSuper = true)
-public class AccountEntity extends TenantEntity {
+public class AccountEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/CollectInfoEntity.java

@@ -17,13 +17,11 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 名菜名点名店收藏 实体类
@@ -35,7 +33,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_collect_info")
 @ApiModel(value = "CollectInfo对象", description = "名菜名点名店收藏")
 @EqualsAndHashCode(callSuper = true)
-public class CollectInfoEntity extends TenantEntity {
+public class CollectInfoEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/DocumentInfoEntity.java

@@ -17,14 +17,13 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
-import java.math.BigDecimal;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 文档信息 实体类
@@ -36,7 +35,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_document_info")
 @ApiModel(value = "DocumentInfo对象", description = "文档信息")
 @EqualsAndHashCode(callSuper = true)
-public class DocumentInfoEntity extends TenantEntity {
+public class DocumentInfoEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/FamousDishEntity.java

@@ -17,14 +17,13 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
-import java.math.BigDecimal;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 名菜 实体类
@@ -36,7 +35,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_famous_dish")
 @ApiModel(value = "FamousDish对象", description = "名菜")
 @EqualsAndHashCode(callSuper = true)
-public class FamousDishEntity extends TenantEntity {
+public class FamousDishEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/FamousLocationEntity.java

@@ -17,11 +17,10 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 名点 实体类
@@ -33,7 +32,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_famous_location")
 @ApiModel(value = "FamousLocation对象", description = "名点")
 @EqualsAndHashCode(callSuper = true)
-public class FamousLocationEntity extends TenantEntity {
+public class FamousLocationEntity extends BaseEntity {
 
 
 }

admin/src/main/java/org/springblade/modules/ycwh/entity/FamousStoreEntity.java

@@ -17,14 +17,13 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
-import java.math.BigDecimal;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 名店 实体类
@@ -36,7 +35,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_famous_store")
 @ApiModel(value = "FamousStore对象", description = "名店")
 @EqualsAndHashCode(callSuper = true)
-public class FamousStoreEntity extends TenantEntity {
+public class FamousStoreEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/FeedbackEntity.java

@@ -17,13 +17,11 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 反馈信息 实体类
@@ -35,7 +33,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_feedback")
 @ApiModel(value = "Feedback对象", description = "反馈信息")
 @EqualsAndHashCode(callSuper = true)
-public class FeedbackEntity extends TenantEntity {
+public class FeedbackEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/InformationInfoEntity.java

@@ -17,13 +17,11 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 资讯信息 实体类
@@ -35,7 +33,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_information_info")
 @ApiModel(value = "InformationInfo对象", description = "资讯信息")
 @EqualsAndHashCode(callSuper = true)
-public class InformationInfoEntity extends TenantEntity {
+public class InformationInfoEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/MemberInfoEntity.java

@@ -17,13 +17,13 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
 
 /**
  * 会员信息 实体类
@@ -35,7 +35,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_member_info")
 @ApiModel(value = "MemberInfo对象", description = "会员信息")
 @EqualsAndHashCode(callSuper = true)
-public class MemberInfoEntity extends TenantEntity {
+public class MemberInfoEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin/src/main/java/org/springblade/modules/ycwh/entity/ProfessionalStyleEntity.java

@@ -17,14 +17,13 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.lang.Boolean;
-import java.math.BigDecimal;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 烹饪专业风采 实体类
@@ -36,7 +35,7 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("ycwh_professional_style")
 @ApiModel(value = "ProfessionalStyle对象", description = "烹饪专业风采")
 @EqualsAndHashCode(callSuper = true)
-public class ProfessionalStyleEntity extends TenantEntity {
+public class ProfessionalStyleEntity extends BaseEntity {
 
 	/**
 	 * 备注

admin_ui/src/option/ycwh/famousLocation.js

@@ -10,5 +10,142 @@ export default {
   selection: true,
   dialogClickModal: false,
   column: [
+    {
+      label: "主键",
+      prop: "id",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "修改人",
+      prop: "updateUser",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "修改时间",
+      prop: "updateTime",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      type: "input",
+    },
+    {
+      label: "顺序",
+      prop: "sort",
+      type: "input",
+    },
+    {
+      label: "封面",
+      prop: "cover",
+      type: "input",
+    },
+    {
+      label: "名称",
+      prop: "name",
+      type: "input",
+    },
+    {
+      label: "副标题",
+      prop: "subTitle",
+      type: "input",
+    },
+    {
+      label: "视频（多个用英文逗号隔开）",
+      prop: "videos",
+      type: "input",
+    },
+    {
+      label: "内容",
+      prop: "content",
+      type: "input",
+    },
+    {
+      label: "所属地区id",
+      prop: "regionId",
+      type: "input",
+    },
+    {
+      label: "地址",
+      prop: "address",
+      type: "input",
+    },
+    {
+      label: "纬度",
+      prop: "latitude",
+      type: "input",
+    },
+    {
+      label: "经度",
+      prop: "longitude",
+      type: "input",
+    },
+    {
+      label: "置顶",
+      prop: "top",
+      type: "input",
+    },
+    {
+      label: "浏览量",
+      prop: "views",
+      type: "input",
+    },
   ]
 }

admin_ui/src/page/index/top/index.vue

@@ -20,9 +20,9 @@
       <div v-if="setting.theme" class="top-bar__item">
         <top-theme></top-theme>
       </div>
-      <div class="top-bar__item">
+<!--      <div class="top-bar__item">
         <top-lang></top-lang>
-      </div>
+      </div> -->
       <div class="top-bar__item" v-if="setting.fullscren">
         <top-full></top-full>
       </div>

admin_ui/src/page/login/index.vue

@@ -8,8 +8,8 @@
         <p class="title">{{ $t('login.info') }}</p>
         <div style="font-size: 15px">
           <span>----------------------------------------------</span>
-          <br />
-          <span>管理租户编号：000000</span>
+         <!-- <br />
+          <span>管理租户编号：000000</span> -->
           <br />
           <span>超级管理员账号: admin / admin</span>
           <br />
@@ -20,12 +20,12 @@
           <span>老板账号: boss / boss</span>
           <br />
           <span>----------------------------------------------</span>
-          <br />
+          <!-- <br />
           <span>普通租户编号：详见租户管理模块</span>
           <br />
           <span>租户管理员账号: admin / admin</span>
           <br />
-          <span>----------------------------------------------</span>
+          <span>----------------------------------------------</span> -->
         </div>
         <!--<img class="img" src="/img/logo.png" alt="">-->
       </div>

admin_ui/src/page/login/userlogin.vue

@@ -7,7 +7,7 @@
     :model="loginForm"
     label-width="0"
   >
-    <el-form-item v-if="tenantMode" prop="tenantId">
+    <!-- <el-form-item v-if="tenantMode" prop="tenantId">
       <el-input
         @keyup.enter="handleLogin"
         v-model="loginForm.tenantId"
@@ -18,7 +18,7 @@
           <i class="icon-quanxian" />
         </template>
       </el-input>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item prop="username">
       <el-input
         @keyup.enter="handleLogin"
@@ -98,9 +98,9 @@ export default {
         //角色ID
         roleId: '',
         //用户名
-        username: 'admin',
+        username: '',
         //密码
-        password: 'admin',
+        password: '',
         //账号类型
         type: 'account',
         //验证码的值

admin_ui/src/views/wel/index.vue

@@ -8,11 +8,11 @@
       <el-col :span="24">
         <basic-container>
           <p style="text-align: center">
-            欢迎使用JiuHub管理后台！
+            欢迎使用管理后台！
           </p>
         </basic-container>
       </el-col>
-      <el-col :span="16">
+      <!-- <el-col :span="16">
         <basic-container>
           
         </basic-container>
@@ -26,7 +26,7 @@
           <basic-container>
           </basic-container>
         </el-col>
-      </el-col>
+      </el-col> -->
     </el-row>
   </div>
 </template>