Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-23 bebea951bb2aa3f1101da97387c21f03650aa332

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java

@@ -15,8 +15,11 @@
@Schema(name = "作物视图")
public class VoCrop implements BaseEntity {
    @Schema(description = "实体id")
    private Long id;
    private String id;

    @Schema(description = "作物名称")
    private String cropName;

    @Schema(description = "备注")
    private String remarks;
}