Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/controller/ReportCancellApplyController.java

@@ -157,7 +157,6 @@ public class ReportCancellApplyController {
                 if(StringUtils.isNotBlank(info.getStatus())){
                     info.setLabelStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus(), "cw_status", ""));
                 }
-                info.setProjectNo("");
             }
         }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/dto/ReportInfoDto.java

@@ -164,11 +164,6 @@ public class ReportInfoDto extends BaseDTO {
      */
     private CwProjectReportData reportDetail;
 
-    /**
-     * 报告号
-     */
-    @Excel(name = "报告号",width = 25,orderNum = "4")
-    private String projectNo;
 
 
 }