Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

8 天以前 e1a5409bfa2cca009160a961d9bff827ff133b1b

 ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java

@@ -183,7 +183,7 @@
    /**
     * 介绍
     */
    @TableField("desc1")
    @TableField("description")
    @JsonProperty("Desc")
    private String desc;