Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-12 335ec6398bb70d60a765b4782376e8141cbfa9cf

 src/main/java/com/xcong/excoin/common/contants/AppContants.java

@@ -74,4 +74,6 @@
     */
    public static final String UPLOAD_IMAGE_SUFFIX = ".jpg";

    public static final String TIME_OUT = "time_out";

}