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

alien-entity/src/main/java/shop/alien/entity/storePlatform/vo/StoreOperationalActivityMySignupVo.java

@@ -76,4 +76,7 @@ public class StoreOperationalActivityMySignupVo {
 
     @ApiModelProperty(value = "状态文案")
     private String statusLabel;
+
+     @ApiModelProperty(value = "店铺名称")
+    private String storeName;
 }

alien-entity/src/main/resources/mapper/storePlatform/StoreOperationalActivitySignupMapper.xml

@@ -110,7 +110,8 @@
             s.status AS signupAuditStatus,
             CASE WHEN a.status = 7 THEN 1 ELSE 0 END AS activityStartStatus,
             CASE WHEN ach.signup_id IS NULL THEN 0 ELSE 1 END AS hasAchievement,
-            s.signup_time AS signupTime
+            s.signup_time AS signupTime,
+            si.store_name AS storeName
         FROM store_operational_activity_signup s
         INNER JOIN store_operational_activity a ON a.id = s.activity_id
         LEFT JOIN store_img img ON img.store_id = a.store_id
@@ -120,6 +121,7 @@
         LEFT JOIN store_user su ON su.store_id = a.store_id
             AND su.account_type = 1
             AND su.delete_flag = 0
+        LEFT JOIN store_info si ON si.id = a.store_id
         LEFT JOIN (
             SELECT DISTINCT signup_id
             FROM store_operational_activity_achievement