Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -135,7 +135,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
             adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
 
             toMqSqls.add(SqlMapping.get("adam_user.add"));
-            initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now});
+            initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
             toMqSqls.add(SqlMapping.get("adam_user_info.add"));
             initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getAvatar(), userInfoVo.getQrCode()});
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -47,6 +47,7 @@ public class RedisDataUtils {
         List<SweetManualAppletDto> data = sweetManualMapper.getManualAppletDto();
         for (SweetManualAppletDto item : data) {
             item.setFieldName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "name"));
+            item.setCityName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "latitude"));
             item.setLongitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "longitude"));
         }