dy 1974070a0a Merge remote-tracking branch 'origin/activity' into activity ... # Conflicts: # sino-activity/src/main/resources/templates/activity/info/add.html		2021-04-09 09:53:37 +08:00
..
DrawTaskNotify	活动管理-列表名称修改	2021-03-31 14:15:44 +08:00
awardRecord	活动管理-下拉框修改	2021-03-31 15:57:23 +08:00
consume	活动管理-抽奖次数使用明细修改	2021-03-31 15:20:15 +08:00
info	Merge remote-tracking branch 'origin/activity' into activity	2021-04-09 09:53:37 +08:00
prizeInfo	活动管理-下拉框修改	2021-03-31 15:57:23 +08:00
record	活动管理-下拉框修改	2021-03-31 15:45:56 +08:00