Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/service/business/PatentProjectService.java

@@ -890,7 +890,7 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
         }
         else if(roleType.equals(2))
         {
-            rootSql="p.tenantId="+tenantId;
+            rootSql="p.tenant_id="+tenantId;
         }
 
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -938,7 +938,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
         }
         else if(roleType.equals(2))
         {
-            rootSql="p.tenantId="+tenantId;
+            rootSql="p.tenant_id="+tenantId;
         }
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
             sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");