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

zhanghua

2023-08-15 2b59293282a3245208531a924173e87518f5a1c1

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

@@ -28,7 +28,7 @@
    private String telephone;
    @JsonProperty("Typ")
    private int typ;
    @JsonProperty("CreateAt")
    @JsonProperty("Creator")
    private String creator;
    @JsonProperty("CreateAt")
    private long createAt;