Merge remote-tracking branch 'origin/main'

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/BaseCountry.java

@@ -64,16 +64,5 @@ public class BaseCountry extends BaseEntity {
      */
     @TableField(value = "area_code")
     private Integer areaCode;
-    /**
-     * 经度
-     */
-    @TableField(value = "longitude")
-    private String longitude;
-
-    /**
-     * 维度
-     */
-    @TableField(value = "latitude")
-    private String latitude;
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopOpinionType.java

@@ -31,7 +31,17 @@ public class ShopOpinionType extends BaseEntity {
     @TableField(value = "type_name")
     private String typeName;
 
+    /**
+     * 类型描述
+     */
+    @TableField(value = "type_description")
+    private String typeDescription;
 
+    /**
+     * 状态 0启用 1禁用
+     */
+    @TableField(value = "status")
+    private String status;
 
     /**
      * 其他类型（用户填写）
@@ -39,5 +49,10 @@ public class ShopOpinionType extends BaseEntity {
     @TableField(value = "other_type")
     private String otherType;
 
+    /**
+     * 语言id
+     */
+    @TableField(value = "language_id")
+    private String languageId;
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopReview.java

@@ -42,7 +42,11 @@ public class ShopReview extends BaseEntity {
      */
     @TableField(value = "product_id")
     private Long productId;
-
+    /**
+     * 订单号
+     */
+    @TableField(value = "order_id")
+    private Long orderId;
     /**
      * SKU
      */

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/BaseCountryMapper.xml

@@ -12,8 +12,6 @@
     <result column="country_name_local" jdbcType="INTEGER" property="countryNameLocal" />
     <result column="country_img" jdbcType="INTEGER" property="countryImg" />
     <result column="area_code" jdbcType="INTEGER" property="areaCode" />
-    <result column="longitude" jdbcType="VARCHAR" property="longitude" />
-    <result column="latitude" jdbcType="VARCHAR" property="latitude" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
@@ -23,7 +21,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, parent_id, image_url, service_charge_value, country_name, serve_state, project, longitude,latitude
+    id, parent_id, image_url, service_charge_value, country_name, serve_state, project,
     create_time, create_user_id, update_time, update_user_id, delete_flag
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopOpinionTypeMapper.xml

@@ -6,6 +6,8 @@
     <!--@Table shop_opinion_type-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="type_name" jdbcType="VARCHAR" property="typeName" />
+    <result column="type_description" jdbcType="VARCHAR" property="typeDescription" />
+    <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="other_type" jdbcType="VARCHAR" property="otherType" />
@@ -13,10 +15,11 @@
     <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
     <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="language_id" jdbcType="BIGINT" property="languageId" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, type_name, create_time, update_time, other_type, create_user_id, update_user_id, 
+    id, type_name, create_time, update_time, other_type, create_user_id, update_user_id, language_id,type_description,status,
     delete_flag, project
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopReviewMapper.xml

@@ -9,6 +9,7 @@
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="product_id" jdbcType="BIGINT" property="productId" />
     <result column="sku_id" jdbcType="BIGINT" property="skuId" />
+    <result column="order_id" jdbcType="BIGINT" property="orderId" />
     <result column="rating" jdbcType="INTEGER" property="rating" />
     <result column="content" jdbcType="LONGVARCHAR" property="content" />
     <result column="project" jdbcType="VARCHAR" property="project" />
@@ -20,7 +21,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, parent_id, user_id, product_id, sku_id, rating, content, project, create_time, 
+    id, parent_id, user_id, product_id, sku_id, rating, content, project, create_time, order_id,
     create_user_id, update_time, update_user_id, delete_flag
   </sql>
 </mapper>