Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

6 天以前 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead

 north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderProcessSortDTO.java

New file
@@ -0,0 +1,12 @@
package com.example.erp.dto.sd;

import lombok.Data;

@Data
public class OrderProcessSortDTO {
    private String sort;
    private String process;
    //判断是否是复合工序
    private String recombination;

}