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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -112,10 +112,10 @@ public class KylinOrderTicketVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 15, value = "代理id")
     private String agentId;
 
-    @ApiModelProperty(position = 15, value = "代理状态[1-开启|2-关闭]")
-    private int agentStatus;
-    @ApiModelProperty(position = 15, value = "票提")
-    private BigDecimal agentDistributions;
+//    @ApiModelProperty(position = 15, value = "代理状态[1-开启|2-关闭]")
+//    private int agentStatus;
+//    @ApiModelProperty(position = 15, value = "票提")
+//    private BigDecimal agentDistributions;
 
     @ApiModelProperty(position = 15, value = "是否会员")
     private Integer isMember;

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql

+----                上线需要注意事项            ----
+----    1.redis用sweet
+----    2.消费用sweet消费
+----    3.config、order、smile、consumer-sweet、需要上线
+----    4.order需要上线 修改了数据库 未修改vo
+
 ----                添加代理字段              ----
     alter table kylin_order_ticket_relations
         add agent_status int default 1 comment '代理状态[1-开启|2-关闭]';