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

peng

8 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 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;