Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

# Conflicts:
#	dist/css/chunk-08b2d41b.3fcf9c04.css
#	dist/css/chunk-09efd3db.439cdc24.css
#	dist/css/chunk-12a2bbcb.bde4bb10.css
#	dist/css/chunk-1faddb40.fc56fcc3.css
#	dist/css/chunk-36ba0820.bde4bb10.css
#	dist/css/chunk-38f3e129.3fcf9c04.css
#	dist/css/chunk-3deefcb9.439cdc24.css
#	dist/css/chunk-3deefcb9.f63e5908.css
#	dist/css/chunk-5bfafd3a.bc3c28c9.css
#	dist/css/chunk-5bfafd3a.ca0cb1ae.css
#	dist/css/chunk-5e5ba01d.bde4bb10.css
#	dist/css/chunk-78fca734.3fcf9c04.css
#	dist/css/chunk-be9d6c3c.8e000104.css
#	dist/index.html
#	dist/js/app.63eba79b.js
#	dist/js/app.bff27817.js
#	dist/js/app.de78b118.js
#	dist/js/chunk-055e7b5b.b2139e43.js
#	dist/js/chunk-055e7b5b.c01be27d.js
#	dist/js/chunk-055e7b5b.e8f845d6.js
#	dist/js/chunk-09efd3db.ed025ea9.js
#	dist/js/chunk-0d4ebdfa.d8652263.js
#	dist/js/chunk-12a2bbcb.2af2690d.js
#	dist/js/chunk-1faddb40.a04cfd1d.js
#	dist/js/chunk-28cb370c.79486b7e.js
#	dist/js/chunk-28cb370c.867abecc.js
#	dist/js/chunk-28cb370c.af3249fd.js
#	dist/js/chunk-34bff564.5c41d86f.js
#	dist/js/chunk-34bff564.b4f28605.js
#	dist/js/chunk-34bff564.ca3eef49.js
#	dist/js/chunk-350bdb36.aa893814.js
#	dist/js/chunk-36ba0820.2309fff2.js
#	dist/js/chunk-3ab2cf8c.aa02de9e.js
#	dist/js/chunk-3ab2cf8c.c0c7aba8.js
#	dist/js/chunk-3ab2cf8c.d19411fe.js
#	dist/js/chunk-3deefcb9.4973e28d.js
#	dist/js/chunk-3deefcb9.b5829a10.js
#	dist/js/chunk-474caa97.4c5f1cad.js
#	dist/js/chunk-474caa97.a391f654.js
#	dist/js/chunk-474caa97.f64aab3e.js
#	dist/js/chunk-5bfafd3a.a83e3028.js
#	dist/js/chunk-5e5ba01d.15028cc2.js
#	dist/js/chunk-6287d3af.892eae6e.js
#	dist/js/chunk-6287d3af.c25a6272.js
#	dist/js/chunk-6287d3af.fa4fbc54.js
#	dist/js/chunk-9ee6367a.5fdfc03f.js
#	dist/js/chunk-a49129fc.e70f4b64.js
#	dist/js/chunk-bb542da4.261bc160.js
#	dist/js/chunk-f803170c.0456fdb1.js
#	dist/js/chunk-f803170c.32a39cba.js
#	dist/js/chunk-f803170c.62835622.js

src/views/card/gic-card/card-list.vue

@@ -287,8 +287,8 @@ export default {
       let params = { ...this.listParams, memberCardId: this.currentAreaId };
       params.sortOrder = params.sortOrder || 'desc';
       if(params.searchType == 1) params.cardName = params.search;
-      if(params.searchType == 2) params.subTitle = params.search;
-      if(params.searchType == 3) params.remarkName = params.search;
+      if(params.searchType == 2) params.remarkName = params.search;
+      if(params.searchType == 3) params.subTitle = params.search;
       if(params.searchType == 4) params.erpDemoCode = params.search;
       delete params.search;
       delete params.searchType;