Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

liding

9 小时以前 29c0f2e4bb55bf486b7a5cf95e2ad4b215d4d281

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -83,4 +83,7 @@
     */
    @Excel(name = "UID码")
    private String uidNo;

    @TableField(exist = false)
    private String parentName;
}