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

This commit is contained in:
juntao
2020-09-25 11:08:56 +08:00
3 changed files with 10 additions and 5 deletions

View File

@ -54,17 +54,19 @@ data class RegulationTest(
// 最近访客
@Parcelize
data class LastVisitor(
@SerializedName("_id")
var id: String = "",
var name: String = "",
var icon: String = "") : Parcelable
// 徽章
@Parcelize
data class Badge(
var name: String = "",
var icon: String = "",
var actions: List<BadgeAction>? = null) : Parcelable
// 领取条件
// 徽章领取条件
@Parcelize
data class BadgeAction(
var text: String = "") : Parcelable