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

pjb

2 天以前 9ea93abc2606948e5724316a4a3ec338ea14a130

 src/main/java/com/zy/asrs/entity/result/LocDetlAll.java

@@ -29,6 +29,8 @@
    private Date appe_time;
    private String meno;
    private String manu;
    private Integer inventory_max;
    private Integer inventory_min;

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