合并分支

openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java

@@ -66,4 +66,6 @@ public class SysTenantOption implements Serializable {
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
+    
+
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java

@@ -102,13 +102,10 @@ public class PaymentReconciliation extends HisBaseEntity {
     private String ybSettleIds;// 记录医保结算id
 
     /** 医保清算标志 */
-<<<<<<< HEAD
     private Integer ybClearFlag;//默认值0 未清算
 
     /** 退号/退费原因 */
     @TableField("refund_reason")
     private String refundReason;
-=======
-    private Integer ybClearFlag;// 默认值0 未清算
->>>>>>> upstream/develop
+    
 }