Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -146,6 +146,8 @@
        shop.setIsrec(Constants.ONE);
        shop.setOrigin(Constants.ONE);
        shop.setSaleType(Constants.formatIntegerNum(shop.getSaleType()));
        shop.setAmount(BigDecimal.ZERO);
        shop.setTotalAmount(BigDecimal.ZERO);
        String salt = RandomStringUtils.randomAlphabetic(6);

        shop.setPassword(shop.getCode()+"@123456");