Merge branch 'master' into pre

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/SweetYbEnrollParam.java

@@ -39,4 +39,8 @@ public class SweetYbEnrollParam implements Serializable {
     @ApiModelProperty(position = 17, required = false, value = "院校", example = " 川音，现音，其他")
     private String universities;
 
+    @ApiModelProperty(position = 18, required = true, value = "常驻城市名称", example = "北京")
+    @NotBlank(message = "请填写常驻城市")
+    private String cityName;
+
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetYbEnroll.java

@@ -65,6 +65,11 @@ public class SweetYbEnroll implements Serializable {
      */
     private String universities;
 
+    /**
+     * 常驻城市名称
+     */
+    private String cityName;
+
     /**
      * 创建时间
      */

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -508,6 +508,8 @@ CREATE TABLE `sweet_yb_enroll`
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT 'YB报名表';
+alter table sweet_yb_enroll
+    add city_name varchar(255) NOT NULL DEFAULT '' COMMENT '常驻城市名称' after universities;
 
 -- 城市投票表
 drop TABLE if exists `sweet_city_vote`;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetYbEnrollServiceImpl.java

@@ -39,7 +39,8 @@ public class SweetYbEnrollServiceImpl extends ServiceImpl<SweetYbEnrollMapper, S
         sqlsDataA.add(new Object[]{
                 IDGenerator.nextSnowId(), StringUtil.isEmpty(param.getContactTell()) ? "" : param.getContactTell(),
                 StringUtil.isEmpty(param.getContactWechat()) ? "" : param.getContactWechat(), param.getNickname(), param.getStyle(),
-                param.getImgUrl(), param.getAudioUrl(), StringUtil.isEmpty(param.getUniversities()) ? "" : param.getUniversities()
+                param.getImgUrl(), param.getAudioUrl(), StringUtil.isEmpty(param.getUniversities()) ? "" : param.getUniversities(),
+                StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName()
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));