Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-07-26 715a2691d88ffbe5f5be9e5403c166f923088fcc

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

@@ -364,6 +364,8 @@
                shop.setLegalPhone(model.getLegalPhone());
                shop.setLegalIdcode(model.getLegalIdcode());
                shop.setLegalName(model.getLegalName());
                shop.setFcode(model.getFcode());
                shop.setScode(model.getScode());
                shop.setTaxRegCode(model.getTaxRegCode());
                shopMapper.updateById(shop);
            }
@@ -742,6 +744,7 @@
            shop.setSecondType(model.getSecondType());
            shop.setAttribute(model.getAttribute());
            shop.setParentIamId(model.getParentOrgId());
            shop.setScode(model.getScode());
            newList.add(shop);
        }else {
            shop.setEditor(loginUserInfo.getId());
@@ -750,6 +753,7 @@
            shop.setSecondType(model.getSecondType());
            shop.setName(model.getName());
            shop.setCode(model.getCode());
            shop.setScode(model.getScode());
            shop.setUnitCode(model.getUnitCode());
            if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
                shop.setIsdeleted(Constants.ONE);