Merge remote-tracking branch 'origin/master'

wangting

2023-07-06 b379f48fc13255c4a8d946f1c87678512a133107

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java

@@ -24,7 +24,7 @@
   @TableId(value = "OID",type = IdType.ASSIGN_UUID)
   private String oid;

   @TableField(value = "ID")
   @TableField(value = "id")
   private String id;

   private String name;