Переглянути джерело

Merge remote-tracking branch 'origin/test' into test2

xuzuoyun 5 роки тому
батько
коміт
79510e55bf

+ 18 - 0
module-report/pom.xml

@@ -47,4 +47,22 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <!-- 解决MyBatis配置文件引入问题 -->
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <!-- 是否替换资源中的属性-->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>

+ 2 - 0
module-report/src/main/java/cn/com/ctop/bytedance/mapper/ReportMapper.java

@@ -2,10 +2,12 @@ package cn.com.ctop.bytedance.mapper;
 
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+@Mapper
 public interface ReportMapper {
 
     /**

+ 0 - 1
module-report/src/main/java/cn/com/ctop/bytedance/mapper/xml/ReportMapper.xml

@@ -159,7 +159,6 @@
       ctop_kuaishou_report_daily_account
       where stat_date = #{statDate}
       group by stat_date
-
     </select>
 
 </mapper>