Merge branch 'tlhhup'

离歌笑

2019-10-22 65b30b7cac0a3fdcb8cec19c73411af0e2858766

 WebService/src/main/java/com/java110/web/smo/resourceStore/impl/AddResourceStoreSMOImpl.java

@@ -32,10 +32,10 @@

        //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
        Assert.hasKeyAndValue(paramIn, "resName", "必填，请填写物品名称");
        Assert.hasKeyAndValue(paramIn, "resCode", "必填，请填写物品编码");
        //Assert.hasKeyAndValue(paramIn, "resCode", "必填，请填写物品编码");
        Assert.hasKeyAndValue(paramIn, "price", "必填，请填写物品价格");
        Assert.hasKeyAndValue(paramIn, "stock", "必填，请填写物品库存");
        Assert.hasKeyAndValue(paramIn, "description", "必填，请填写描述");
        //Assert.hasKeyAndValue(paramIn, "stock", "必填，请填写物品库存");
        //Assert.hasKeyAndValue(paramIn, "description", "必填，请填写描述");


        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_RESOURCESTORE);