java/yicang.git

			@@ -14,6 +14,7 @@
			<result column="pay_time" property="payTime" />
			<result column="pay_remark" property="payRemark" />
			<result column="pay_voucher" property="payVoucher" />
			<result column="revenue_type" property="revenueType" />
			<result column="create_time" property="createTime" />
			<result column="update_time" property="updateTime" />
			<result column="create_by" property="createBy" />
			@@ -23,12 +24,12 @@

			<!-- 通用查询结果列 -->
			<sql id="Base_Column_List">
			id, province_name,province_code, city_name,city_code, type_id, pay_money, pay_time, pay_remark, pay_voucher, create_time, update_time, create_by, update_by, disabled
			id, province_name,province_code, city_name,city_code, type_id, pay_money, pay_time, pay_remark, pay_voucher,revenue_type, create_time, update_time, create_by, update_by, disabled
			</sql>
			<select id="pageList" resultType="com.ruoyi.system.vo.YcFinancialManagementVO">
			SELECT
			fm.id, fm.province_name,fm.province_code, fm.city_name,fm.city_code, fm.type_id, fm.pay_money, fm.pay_time, fm.pay_remark,
			fm.pay_voucher, fm.create_time, fm.update_time, fm.create_by, fm.update_by, fm.disabled, ty.type_name, ty.revenue_type
			fm.pay_voucher,fm.revenue_type, fm.create_time, fm.update_time, fm.create_by, fm.update_by, fm.disabled, ty.type_name, ty.revenue_type
			FROM yc_financial_management fm
			LEFT JOIN yc_revenue_expenditure_type ty ON fm.type_id = ty.id
			<where>
			@@ -54,7 +55,7 @@
			<select id="financialManagementExport" resultType="com.ruoyi.system.export.YcFinancialManagementExport">
			SELECT
			fm.id, fm.province_name,fm.province_code, fm.city_name,fm.city_code, fm.type_id, fm.pay_money, fm.pay_time, fm.pay_remark,
			fm.pay_voucher, fm.create_time, fm.update_time, fm.create_by, fm.update_by, fm.disabled, ty.type_name, ty.revenue_type
			fm.pay_voucher,fm.revenue_type, fm.create_time, fm.update_time, fm.create_by, fm.update_by, fm.disabled, ty.type_name, ty.revenue_type
			FROM yc_financial_management fm
			LEFT JOIN yc_revenue_expenditure_type ty ON fm.type_id = ty.id
			<where>