Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java

@@ -12,4 +12,8 @@
     * 物业宣传
     */
    public static Integer PROPERTY_PUBLICITY = 1;
    /**
     * 五微服务-微讲堂
     */
    public static Integer FMS_CLASSROOM = 2;
}