Merge remote-tracking branch 'origin/devlop' into devlop

zjj

4 天以前 eeb96ed3c9830f996dc85cc9d4a8113aba91692b

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/TaskInParam.java

@@ -29,6 +29,8 @@
//    private String locType;

    private Long user;

    private String orgLoc;
//    private Integer locType2; //库位类型
//    private Integer locType3; //库位类型
}