Merge branch 'develop' into IFJJV-134-IN-Feel-view-items-tender
Merge branch 'IFJJV-134-IN-Feel-view-items-tender' of https://github.com/if045/tender into IFJJV-134-IN-Feel-view-items-tender
Merge branch 'IFJJV-134-IN-Feel-view-items-tender' of https://github.com/if045/tender into IFJJV-134-IN-Feel-view-items-tender
fix some bugs but not all
divide sql