Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-06-09 da40f82d921daa63de501392519c6ecfbe8962a3

 src/main/java/com/zy/common/service/erp/entity/CPICMO.java

@@ -26,6 +26,9 @@
    // 物料名称
    private String Fname;

    // 规格
    private String Fmodel;

    // 申请数量（需入库数量）
    private Double FAuxQty;