Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -22,6 +22,24 @@
			public static final String BILL_TYPE_ONCE_MONTH = "005";// 一次性按月

			public static final String DEFAULT_FEE_CONFIG = "T";
			public static final String CUSTOME_FEE_CONFIG = "F";

			public static final String FEE_TYPE_CD_WATER = "888800010016";//电费
			public static final String FEE_TYPE_CD_METER = "888800010015";//水费
			public static final String FEE_TYPE_CD_GAS = "888800010009";//煤气
			public static final String FEE_TYPE_CD_SYSTEM = "888800010000";//系统
			public static final String FEE_TYPE_CD_PARKING = "888800010008";//系统

			public static final String CONFIG_ID_RENTING = "920000000000000000";//租赁费用项
			public static final String CONFIG_ID_GOODS = "930000000000000000";//商品费用项

			public static final String COMPUTING_FORMULA_TEMP_CAR = "9999";
			public static final String COMPUTING_FORMULA_RANT_RATE = "1102"; // 租金递增
			public static final String COMPUTING_FORMULA_DYNAMIC = "4004"; // 租金递增

			public static final String PAYMENT_CD_PRE = "1200";
			public static final String PAYMENT_CD_AFTER = "2100";



			private String feeTypeCd;
			@@ -30,8 +48,10 @@
			private String squarePrice;
			private String isDefault;
			private String configId;
			private String[] configIds;
			private String feeFlag;
			private String feeName;
			private String feeNameEq;
			private String startTime;
			private String endTime;
			private String curTime;
			@@ -47,10 +67,17 @@

			private String paymentCycle;

			private String valid;


			private Date createTime;

			private String statusCd = "0";
			private String computingFormulaText;

			private String deductFrom = "Y";

			private double amount;


			public String getFeeTypeCd() {
			@@ -214,4 +241,48 @@
			public void setCurTime(String curTime) {
			this.curTime = curTime;
			}

			public String getValid() {
			return valid;
			}

			public void setValid(String valid) {
			this.valid = valid;
			}

			public String getComputingFormulaText() {
			return computingFormulaText;
			}

			public void setComputingFormulaText(String computingFormulaText) {
			this.computingFormulaText = computingFormulaText;
			}

			public String[] getConfigIds() {
			return configIds;
			}

			public void setConfigIds(String[] configIds) {
			this.configIds = configIds;
			}

			public String getFeeNameEq() {
			return feeNameEq;
			}

			public void setFeeNameEq(String feeNameEq) {
			this.feeNameEq = feeNameEq;
			}

			public double getAmount() {
			return amount;
			}

			public void setAmount(double amount) {
			this.amount = amount;
			}

			public String getDeductFrom() { return deductFrom; }

			public void setDeductFrom(String deductFrom) { this.deductFrom = deductFrom; }
			}