diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index e39605ba9..498c4f436 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -1638,8 +1638,8 @@ - - + @@ -1709,8 +1709,8 @@ - - + @@ -1772,12 +1772,13 @@ - + @@ -1840,12 +1841,13 @@ - + diff --git a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java index d9ceaf735..468362d44 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java @@ -230,14 +230,6 @@ public interface LC_FUND_INCOME{ */ public static final String DEDUCTION_ID = "DEDUCTION_ID"; /** - * Ʊ STRING(10)
- */ - public static final String FPDM = "FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String FPHM = "FPHM"; - /** * Ƿ˾ STRING(2)
*/ public static final String isCompany = "isCompany"; diff --git a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java index 515269412..046012e20 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java @@ -242,14 +242,6 @@ public interface LC_FUND_INCOME_TEMP{ */ public static final String DEDUCTION_ID = "DEDUCTION_ID"; /** - * Ʊ STRING(10)
- */ - public static final String FPDM = "FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String FPHM = "FPHM"; - /** * Ƿ˾ STRING(2)
*/ public static final String isCompany = "isCompany"; diff --git a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java index 7b005e5ac..fc1adf148 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java @@ -209,28 +209,4 @@ public interface LC_RENT_INCOME{ * ѷʽ STRING(10)
*/ public static final String CHARGE_WAY = "CHARGE_WAY"; - /** - * Ʊ STRING(10)
- */ - public static final String RENT_FPDM = "RENT_FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String RENT_FPHM = "RENT_FPHM"; - /** - * Ʊ STRING(10)
- */ - public static final String INTEREST_FPDM = "INTEREST_FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String INTEREST_FPHM = "INTEREST_FPHM"; - /** - * Ʊ STRING(10)
- */ - public static final String PENALTY_FPDM = "PENALTY_FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String PENALTY_FPHM = "PENALTY_FPHM"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java index 883c5b3c4..c03e48d4a 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java @@ -217,28 +217,4 @@ public interface LC_RENT_INCOME_TEMP{ * ѷʽ STRING(10)
*/ public static final String CHARGE_WAY = "CHARGE_WAY"; - /** - * Ʊ STRING(10)
- */ - public static final String RENT_FPDM = "RENT_FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String RENT_FPHM = "RENT_FPHM"; - /** - * Ʊ STRING(10)
- */ - public static final String INTEREST_FPDM = "INTEREST_FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String INTEREST_FPHM = "INTEREST_FPHM"; - /** - * Ʊ STRING(10)
- */ - public static final String PENALTY_FPDM = "PENALTY_FPDM"; - /** - * Ʊ STRING(10)
- */ - public static final String PENALTY_FPHM = "PENALTY_FPHM"; } \ No newline at end of file