Merge remote-tracking branch 'origin/dev' into dev

mp-common/src/main/java/com/qs/mp/common/enums/AwardsLabelEnum.java

@@ -12,10 +12,10 @@ import io.swagger.annotations.ApiModel;
 @ApiModel("奖级标签枚举类")
 public enum AwardsLabelEnum implements IEnum<String> {
 
-    LABEL_ONE("传说", "v2/cs.jpg"),
-    LABEL_TWO("史诗", "v2/ss.jpg"),
-    LABEL_THREE("稀有", "v2/xy.jpg"),
-    LABEL_FOUR("尊贵", "v2/zg.jpg");
+    LABEL_ONE("传说", "v2/cs.png"),
+    LABEL_TWO("史诗", "v2/ss.png"),
+    LABEL_THREE("稀有", "v2/xy.png"),
+    LABEL_FOUR("尊贵", "v2/zg.png");
 
     private final String value;
     private final String picUrl;