Merge branch 'test_bak' into 'master'

罗元桥

2021-09-28 a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductDO.java

@@ -43,6 +43,10 @@
     */
    private Boolean onShelf;
    /**
     * 上架时间
     */
    private Date onShelfAt;
    /**
     * 产品介绍
     */
    private String introduction;