• panhong18943's avatar
    Merge branch 'remote_uat' of https://hel.hand-china.com/hlcm/leaf-hlcm into remote_uat · a71a08ca
    panhong18943 authored
     Conflicts:
    	pom.xml
    	src/main/database/Init/Layout_db_object/INITIALIZE_LAYOUT_DB_OBJECT.sql
    	src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
    	src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_penalty_create.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR515/acr515_invoice_hd_v.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR604/acr_invoice_claim_application_new.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR605/acr_invoice_claim_confirm_new.lwm
    	src/main/webapp/WEB-INF/classes/acr/ACR620/acr_invoice_reverse_apply_detail.lwm
    	src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm
    	src/main/webapp/WEB-INF/classes/cont/CON2000/contract_phone_approval.lwm
    	src/main/webapp/WEB-INF/classes/csh/CSH531/get_trans_review_status.lwm
    	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
    	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/hls_bp_master_bank_account_lov.lwm
    	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106N/csh_transaction_maintain_query.lwm
    	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm
    	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm
    	src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm
    	src/main/webapp/WEB-INF/classes/hls/HLS500N/hls_fin_calc_config_hd_n.lwm
    	src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm
    	src/main/webapp/WEB-INF/classes/hsbc/HSBC100/csh_bank_account.lwm
    	src/main/webapp/WEB-INF/classes/hsbc/HSBC110/get_limited_user.lwm
    	src/main/webapp/WEB-INF/classes/layout/server_layout_common.lwm
    	src/main/webapp/WEB-INF/classes/paraconfig.properties
    	src/main/webapp/WEB-INF/classes/prj/PRJ500D/bp_tenant_old_r_query.lwm
    	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_import_list.lwm
    	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_import_temp.lwm
    	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_item_delete.lwm
    	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_update_temp.lwm
    	src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_csh_result_query.lwm
    	src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm
    	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
    	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
    	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
    	src/main/webapp/WEB-INF/classes/sys/sys_page_menu.lwm
    	src/main/webapp/WEB-INF/classes/wx/WX100/con_contract_query.lwm
    	src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm
    	src/main/webapp/WEB-INF/server-script/layoutconfig/con_tenant_change_modify_t_history_ingo_queryfields.js
    	src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_r_result_queryfields.js
    	src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
    	src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.css
    	src/main/webapp/modules/acp/ACP522/ap_invoice_import_detail.lview
    	src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
    	src/main/webapp/modules/acr/ACR510/acr_invoice_penalty_invoice.lview
    	src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
    	src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
    	src/main/webapp/modules/acr/ACR514/acr_invoice_reverse_apply_temp_detail.lview
    	src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview
    	src/main/webapp/modules/acr/ACR515/hls_acr_vat_zip_file_upload_handle.lview
    	src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
    	src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
    	src/main/webapp/modules/cont/CON2000/collection_sms_query.lview
    	src/main/webapp/modules/cont/CON301N/con_contract_query_entrance.lview
    	src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
    	src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
    	src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview
    	src/main/webapp/modules/cont/CON4000/business_daily_email.lsc
    	src/main/webapp/modules/cont/CON500/con_contract_get_layout_code.lview
    	src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
    	src/main/webapp/modules/cont/CON505/con_contract_modify.lview
    	src/main/webapp/modules/cont/CON620/create_content_for_collection.lsc
    	src/main/webapp/modules/cont/CON620/create_content_for_collection_signatures.lsc
    	src/main/webapp/modules/cont/CON731/hls_before_sign_change_detail.lview
    	src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
    	src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview
    	src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
    	src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
    	src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
    	src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
    	src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
    	src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
    	src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview
    	src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
    	src/main/webapp/modules/csh/CSH560/vender_deposit_return.lview
    	src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/csh_transfer_review_detail.lview
    	src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_transfer_review_maintain.lview
    	src/main/webapp/modules/hls/HLS203N/hls_lease_item_modify_entrance.lview
    	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
    	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview
    	src/main/webapp/modules/hls/HLS214N/hls_bp_master_billing.lview
    	src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
    	src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
    	src/main/webapp/modules/hls/HLS303/bp_agent_create.lview
    	src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
    	src/main/webapp/modules/hls/HLS303/bp_asset_create.lview
    	src/main/webapp/modules/hls/HLS500/hls_fin_calculator_dynamic.lview
    	src/main/webapp/modules/hls/HLS530/manual_journal_create.lview
    	src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
    	src/main/webapp/modules/hsbc/HSBC100/csh_bank_account_choose.lview
    	src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
    	src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview
    	src/main/webapp/modules/hsbc/HSBC120/hsbc_downing_file.lsc
    	src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
    	src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
    	src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import.lview
    	src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview
    	src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_upload.lview
    	src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview
    	src/main/webapp/modules/sys/SYS420/sms_batch_send.lsc
    a71a08ca
Name
Last commit
Last update
..
CCB503 Loading commit data...
CCB600 Loading commit data...
ccb301 Loading commit data...
ccb305 Loading commit data...
ccb501 Loading commit data...
ccb502 Loading commit data...
ccb_request_format_definition.lview Loading commit data...