Merge branch 'master' of chenweida/esb into master

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsResourceController.java

@@ -437,8 +437,8 @@ public class RsResourceController extends BaseController {
            String rate = request.getParameter("rate");
            String code = request.getParameter("code");
            String name = request.getParameter("name");
            String supportType = request.getParameter("supportType");
            String type = request.getParameter("type");
            String supportType = request.getParameter("inp_resource_support_type");
            String type = request.getParameter("inp_resource_type");
            String id = request.getParameter("id");
            RsResource rs = new RsResource();
            rs.setId(id);
@@ -470,8 +470,8 @@ public class RsResourceController extends BaseController {
            String rate = request.getParameter("rate");
            String code = request.getParameter("code");
            String name = request.getParameter("name");
            String supportType = request.getParameter("supportType");
            String type = request.getParameter("type");
            String supportType = request.getParameter("inp_resource_support_type");
            String type = request.getParameter("inp_resource_type");
            RsResource rs = new RsResource();
            rs.setCode(code);
            rs.setType(type);