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

pjb

2 天以前 9ea93abc2606948e5724316a4a3ec338ea14a130

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -175,10 +175,7 @@
    /**
     * uuid时间戳
     */
    @ApiModelProperty(value= "uuid")
    @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
    @TableField("uuid")
    private String uuid;


    public String getOwner$(){
        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);