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

peng

7 天以前 463add4ee035938f9622a6c981668620f097067d

 framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java

@@ -9,6 +9,7 @@
public enum GoodsSalesModeEnum {

    RETAIL("零售"),
    PRESALE("预售"),
    WHOLESALE("批发");

    private final String description;