15376779826 f724637d39 Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm hai 1 mes
..
java 77c382c4d7 Merge branch 'refs/heads/master' into openIm hai 1 mes
resources 0a4809cca7 im hai 1 mes