Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

 src/main/java/com/moral/entity/OperateUser.java

@@ -2,10 +2,13 @@


import java.util.Date;



import javax.persistence.Id;



import lombok.Data;



@Data

public class OperateUser {

   @Id

    private Integer id;



    private String jobNumber;