Merge remote-tracking branch 'origin/master'

龚焕茏

2024-07-31 9b10f135f3015c2175e54870d783fea9b8d8dea1

 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();