Merge remote-tracking branch 'origin/master'

jiangping

2023-12-22 9e0dfce91096989056aaa9bb02e946d6e06465a5

 server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java

@@ -72,6 +72,7 @@
            r.setId(ids[i]);
            r.setName(names[i-1]);
            r.setCode( ids[i]);
            r.setIdNo("34112219880427042"+i);
            r.setIsdeleted(Constants.ONE);
            r.setName(names[i]);
            r.setFaceImg("/20223402/"+r.getId()+".png");