Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

# Conflicts: # openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
2025-02-25 11:35:10 +08:00
parent 10b44933ab ede41782b4
commit a4e34e2beb
7 changed files with 712 additions and 29 deletions
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
@@ -28,7 +28,7 @@ public class Organization extends HisBaseEntity {
    private Long id;

    /** 编码 */
-    private String bus_no;
+    private String busNo;

    /** 名称 */
    private String name;