Merge branch 'dbname' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/entity/SubUserEmail.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("sub_user_email")
+@TableName("adweb_sub_user_email")
 public class SubUserEmail implements Serializable {
     private static final long serialVersionUID = 1L;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/SubUserEmailMapper.xml

@@ -5,6 +5,6 @@
 
     <delete id="removeAll">
         DELETE
-        FROM sub_user_email
+        FROM adweb_sub_user_email
     </delete>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/entity/SeoPlanSubscription.java

@@ -21,7 +21,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("seo_plan_subscription")
+@TableName("adweb_seo_plan_subscription")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "seo套餐订购")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/SeoPlanSubscriptionMapper.java

@@ -30,7 +30,7 @@ public interface SeoPlanSubscriptionMapper extends BaseMapper<SeoPlanSubscriptio
      * @Date: 2021/4/6
      */
     @Select("select t1.plan_name planName, t1.keyword_count keywordCount, t1.service_time serviceTime, t1.price price,t2.plan_id planId " +
-            "from subscribe_plan t1 ,seo_plan_subscription t2 " +
+            "from adweb_subscribe_plan t1 ,adweb_seo_plan_subscription t2 " +
             "where t1.id = t2.plan_id AND t2.site_id = #{siteId} AND t2.status = 1")
     Map<String, String> getSubscribePlanBySiteId(Integer siteId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoKeywordsMapper.xml

@@ -79,7 +79,7 @@
             IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
             seo_market_plan t1,
-            seo_plan_subscription t2,
+            adweb_seo_plan_subscription t2,
             adweb_site t3
         WHERE
             t2.`status` = 1
@@ -321,7 +321,7 @@
             t1.id,
             t1.plan_id
         FROM
-            seo_plan_subscription t1,
+            adweb_seo_plan_subscription t1,
             adweb_site t2
         WHERE
             t1.site_id = t2.id

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/mapper/xml/SeoPlanSubscriptionMapper.xml

@@ -5,8 +5,8 @@
         SELECT
             IF(COUNT(*) = 0 OR t1.target IS NULL, 10, t1.target)
         FROM
-            subscribe_plan t1,
-            seo_plan_subscription t2,
+            adweb_subscribe_plan t1,
+            adweb_seo_plan_subscription t2,
             adweb_site t3
         WHERE
             t2.`status` = 1

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/Sohoeb2bOrder.java

@@ -19,7 +19,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("sohoeb2b_order")
+@TableName("adweb_sohoeb2b_order")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "苏豪通订单地址配置表")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/entity/SubscribePlan.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
  * @Version: V1.0
  */
 @Data
-@TableName("subscribe_plan")
+@TableName("adweb_subscribe_plan")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "网站营销方案套餐表")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/mapper/xml/SubscribePlanMapper.xml

@@ -7,8 +7,8 @@
         SELECT
             t1.id,t1.plan_name,specify_keyword,long_tail_keyword,external_links,article
         from
-            subscribe_plan t1,
-            seo_plan_subscription t2
+            adweb_subscribe_plan t1,
+            adweb_seo_plan_subscription t2
         where
             t1.id = t2.plan_id
             and t1.status = 1