~liuwh/nsjcy.git

$LAPTOP-RI7D261L\Mr Ke$

Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

LAPTOP-RI7D261L\Mr Ke

2020-02-20 54321380dfe9628f79b36e909b826cf921098a7d

refs
author	LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
	Thursday, February 20, 2020 10:36 +0800
committer	LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
	Thursday, February 20, 2020 10:36 +0800
commit	54321380dfe9628f79b36e909b826cf921098a7d
tree	bc722932c893151041d681bf4b236bceec2e9c28 tree \| zip \| gz
parent	cc9b6c6bcedf265549d70ac0c99eb0629fad98a2 view \| diff 6383764128f9f38513df1a55449b230a7b29092a view \| diff

Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

# Conflicts:
#	SunshineIns/src/fetch/_fetch.js

23 files added

16 files modified

	SunshineIns/src/data/menu.js	44 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/_fetch.js	1 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/activeManage.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/attachmentDownload.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/auditPerson.js	5 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/deleteActive.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/entryAudit.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/entryFind.js	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/entryQuery.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/entrySave.js	7 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/getActPerson.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/getActiveDetail.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/index.js	24 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/publishActive.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/publishResult.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/saveActive.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialDelete.js	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialQuery.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialSave.js	7 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialUpdate.js	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialfind.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/index.jsx	35 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ActiveManage.jsx	61 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ActiveManageEdit.jsx	405 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ApplyFor.jsx	186 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ApplyForEdit.jsx	325 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/BusList.jsx	126 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CareList.jsx	191 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CareListEdit.jsx	464 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/Examine.jsx	167 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ExamineEdit.jsx	328 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/Login.jsx	4 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/Newly.jsx	33 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/NewlyList.jsx	33 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/PoliceSecurity.jsx	168 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/SignIn.jsx	33 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/policeSecurityEdit.jsx	328 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/view/LoginView/index.jsx	4 ●●●●● diff \| view \| raw \| blame \| history
	package-lock.json	13720 ●●●●● diff \| view \| raw \| blame \| history