Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-04-26 fc223b26f87f7a221b38084bb62d8047974bbf1c

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java

@@ -35,6 +35,10 @@
     */
    private Long proId;
    /**
     * 产品类型
     */
    private Integer proType;
    /**
     * 产品/明细名称
     */
    private String proName;