线下兑现

yyc-common-ding/src/main/java/net/yyc/common/ding/enums/DingEnum.java

@@ -23,12 +23,14 @@ public enum DingEnum {
 	SETTLE_STATUS_NO(4,"未结算"),
 	SETTLE_STATUS_PART(5,"部分提交"),
 	SETTLE_STATUS_WAIT(9,"待结算"),
-	PAY_OFFLINE(10,"线下兑现"),
+	SETTLE_STATUS_OFFLINE(13,"线下兑现"),
+
 
 	NOTE_STATUS_NO(0,"未结算"), // 未提交/提交失败
 	NOTE_STATUS_SUCCESS(1,"结算成功"),
 	NOTE_STATUS_FAIL(2,"结算失败"),  //提交成功  人力家返回结算失败
 	NOTE_STATUS_SUBMIT(3,"已提交"),
+	NOTE_STATUS_OFFLINE(13,"线下兑现"),
 //	NOTE_STATUS_WAIT(9,"待认证"),
 
 

yyc-common-oss/src/main/java/net/yyc/common/oss/OssProperties.java

@@ -77,4 +77,6 @@ public class OssProperties {
 	 */
 	private String bucketName = "payerp";
 
+	private String objectKeyPre = "";
+
 }