Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-04-24 b4604967492c123e68cab3b2c016b5469bfdbffa

Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

 src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java

@@ -79,11 +79,11 @@
    @Override
    public SimpleFileVo getSimpleFileVoById(Long id) {
        if(id == null){
            return new SimpleFileVo();
            return null;
        }
        List<CustomerFollowUpFile> followUpFilesByIds = customerFollowUpService.getFollowUpFilesByIds(Lists.newArrayList(id));
        if(CollUtil.isEmpty(followUpFilesByIds)){
            return new SimpleFileVo();
            return null;
        }
        return SimpleFileVo.convert(followUpFilesByIds.get(0));
    }

 src/main/java/com/ruoyi/production/pojo/ProductProcess.java

@@ -60,11 +60,11 @@
     * 工资定额
     */
    @Excel(name = "工资定额")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
//    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal salaryQuota;

    @ApiModelProperty("类型 区分是计时还是计件 0 计时 1计件")
    @Excel(name = "类型 0 计时 1计件")
//    @Excel(name = "类型 0 计时 1计件")
    private Long type;

    /**