Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/BucketFileBus.java

     SERVICEHALL("网点","servicehall"),
     INVW("库存系统","invw"),
     MANAGEW("后台系统","managew"),
-
+    SETTLEW("结算系统","settlew"),
 
     ;
     private String value;

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

     //地址管理
     ADDRESS_INFO_ADD_OR_UPDATE("收货地址新增或修改"),
     ADDRESS_INFO_DELETE("收货地址删除"),
+    ADDRESS_INFO_CONFIRM(""),
     ;
     private final String value;
 

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderRefund.java

 import cn.com.taiji.core.entity.dict.issue.RefundBusiness;
 import cn.com.taiji.core.entity.dict.issue.RefundOperateType;
 import cn.com.taiji.core.entity.dict.issue.RefundStatus;
+import cn.com.taiji.core.entity.dict.pay.PayChannelType;
 import lombok.Getter;
 import lombok.Setter;
 
     private String paymentBankCardId;//付款银行卡号
     @Size(max = 255)
     @Column(name = "PAY_RETURN_TYPE")
-    private String payReturnType;//原路返回类型
+    @Enumerated(EnumType.STRING)
+    private PayChannelType payReturnType;//原路返回类型
     @Size(max = 100)
     @Column(name = "DEVICE_TYPE")
     private String deviceType;//设备类型