Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java

@@ -252,7 +252,7 @@ public class AssetTaskController extends BaseController {
      * @param assetId 资产id
      * @return
      */
-    @ApiOperation(value = "移动应用程序资产", response = AssetCurrent.class)
+    @ApiOperation(value = "移动应用程序资产", response = AssetAppCpPo.class)
     @GetMapping("/apptaskSh")
     public AjaxResult apptaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) {
 

ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml

@@ -46,7 +46,8 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_email
-        where ssdw = #{part} and del_flag=0
+        where ssdw = #{part}
+          and del_flag = 0
     </select>
 </mapper>