# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[fix] 修改编码规范

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[refactor] 添加描述字段

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[fix] 完善导入的功能，改变退款单据的显示条件

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[style] 修改状态

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[style] 修改状态

# Conflicts:
#	src/main/webapp/WEB-INF/classes/acr/ACR510N/acr_inovice_cf_v_n.lwm
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

增加销项发票创建的筛选条件，销项发票维护、确认、反冲、查询的字段调整