Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-07 9b81ed8ec15cc4b3f46c7a630512a268b3a74d74

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java

@@ -26,10 +26,14 @@

    /** 提交人 */
    private Integer commitUser;
    private String commitUserName;

    /** 运维情况 */
    private String ywCondition;

    /** 佐证材料 */
    private String ywProofMaterials;

    public static WorkOrderYwConditionRecordVO getVoByEntity(@NonNull WorkOrderYwConditionRecord entity, WorkOrderYwConditionRecordVO vo) {
        if(vo == null) {
            vo = new WorkOrderYwConditionRecordVO();